]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
page_mapping(): add ifdef around reference to swapper_space
authorAndrew Morton <akpm@linux-foundation.org>
Mon, 28 Apr 2008 09:12:44 +0000 (02:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
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 <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/mm.h

index 24659ed06baedce5aa0e4de8ff96c2f2fa6dce5d..4f3c1b2f44de78a7e0ea4533ac868426b37352f8 100644 (file)
@@ -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;
 }