projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1cdf25d
)
page_mapping(): add ifdef around reference to swapper_space
author
Andrew Morton
<
[email protected]
>
Mon, 28 Apr 2008 09:12:44 +0000
(
02:12
-0700)
committer
Linus Torvalds
<
[email protected]
>
Mon, 28 Apr 2008 15:58:21 +0000
(08:58 -0700)
This fixes the superh build when the pageflags patches are applied.
But it shouldn't unless it's a gcc bug.
Cc: Christoph Lameter <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
include/linux/mm.h
patch
|
blob
|
history
diff --git
a/include/linux/mm.h
b/include/linux/mm.h
index 24659ed06baedce5aa0e4de8ff96c2f2fa6dce5d..4f3c1b2f44de78a7e0ea4533ac868426b37352f8 100644
(file)
--- a/
include/linux/mm.h
+++ b/
include/linux/mm.h
@@
-605,9
+605,12
@@
static inline struct address_space *page_mapping(struct page *page)
struct address_space *mapping = page->mapping;
VM_BUG_ON(PageSlab(page));
+#ifdef CONFIG_SWAP
if (unlikely(PageSwapCache(page)))
mapping = &swapper_space;
- else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
+ else
+#endif
+ if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
mapping = NULL;
return mapping;
}