path: root/include
diff options
authorKirill A. Shutemov <kirill@shutemov.name>2012-12-26 03:19:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-18 11:23:26 -0800
commit2f91ec8cc456d6e57db3ebced34a9e96a356168f (patch)
tree4471784343e5fc2827050f8dc754518ae722129d /include
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff)
asm-generic, mm: pgtable: convert my_zero_pfn() to macros to fix build
Commit 816422ad7647 ("asm-generic, mm: pgtable: consolidate zero page helpers") broke the compile on MIPS if SPARSEMEM is enabled. We get this: In file included from arch/mips/include/asm/pgtable.h:552, from include/linux/mm.h:44, from arch/mips/kernel/asm-offsets.c:14: include/asm-generic/pgtable.h: In function 'my_zero_pfn': include/asm-generic/pgtable.h:466: error: implicit declaration of function 'page_to_section' In file included from arch/mips/kernel/asm-offsets.c:14: include/linux/mm.h: At top level: include/linux/mm.h:738: error: conflicting types for 'page_to_section' include/asm-generic/pgtable.h:466: note: previous implicit declaration of 'page_to_section' was here Due header files inter-dependencies, the only way I see to fix it is convert my_zero_pfn() for __HAVE_COLOR_ZERO_PAGE to macros. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: David Daney <david.daney@cavium.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 701beab27aa..5cf680a98f9 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -461,10 +461,8 @@ static inline int is_zero_pfn(unsigned long pfn)
return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);
-static inline unsigned long my_zero_pfn(unsigned long addr)
- return page_to_pfn(ZERO_PAGE(addr));
+#define my_zero_pfn(addr) page_to_pfn(ZERO_PAGE(addr))
static inline int is_zero_pfn(unsigned long pfn)