summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-08-10 13:53:41 +1000
committerPaul Mackerras <paulus@samba.org>2005-08-30 12:08:10 +1000
commitb74d0bd53406c23636707565d87ddaa55d315b26 (patch)
tree6f4245e1363b7cf5e74d84cd025ad804eeb04bfe /include
parent40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (diff)
downloadop-kernel-dev-b74d0bd53406c23636707565d87ddaa55d315b26.zip
op-kernel-dev-b74d0bd53406c23636707565d87ddaa55d315b26.tar.gz
[PATCH] ppc64: four level pagetables fix
With CONFIG_HUGETLB_PAGE=n: In file included from kernel/sysctl.c:37: include/linux/hugetlb.h:104:1: warning: "hugetlb_free_pgd_range" redefined In file included from include/linux/mm.h:36, from kernel/sysctl.c:23: include/asm/pgtable.h:492:1: warning: this is the location of the previous definition Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc64/pgtable.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h
index 5ea952a..c83679c 100644
--- a/include/asm-ppc64/pgtable.h
+++ b/include/asm-ppc64/pgtable.h
@@ -489,8 +489,10 @@ extern pgd_t swapper_pg_dir[];
extern void paging_init(void);
+#ifdef CONFIG_HUGETLB_PAGE
#define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \
free_pgd_range(tlb, addr, end, floor, ceiling)
+#endif
/*
* This gets called at the end of handling a page fault, when
OpenPOWER on IntegriCloud