[PATCH] ppc64: four level pagetables fix
authorAndrew Morton <akpm@osdl.org>
Wed, 10 Aug 2005 03:53:41 +0000 (13:53 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 30 Aug 2005 02:08:10 +0000 (12:08 +1000)
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>
include/asm-ppc64/pgtable.h

index 5ea952ad7164ba77b3db8f473324bfe402710a5b..c83679c9d2b0f49d07ade70a6255c5af32d38074 100644 (file)
@@ -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