projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[linux-2.6-microblaze.git]
/
mm
/
util.c
diff --git
a/mm/util.c
b/mm/util.c
index
0837570
..
53af0e7
100644
(file)
--- a/
mm/util.c
+++ b/
mm/util.c
@@
-804,10
+804,10
@@
struct address_space *folio_mapping(struct folio *folio)
return swap_address_space(folio_swap_entry(folio));
mapping = folio->mapping;
return swap_address_space(folio_swap_entry(folio));
mapping = folio->mapping;
- if ((unsigned long)mapping & PAGE_MAPPING_
ANON
)
+ if ((unsigned long)mapping & PAGE_MAPPING_
FLAGS
)
return NULL;
return NULL;
- return
(void *)((unsigned long)mapping & ~PAGE_MAPPING_FLAGS)
;
+ return
mapping
;
}
EXPORT_SYMBOL(folio_mapping);
}
EXPORT_SYMBOL(folio_mapping);