From: Andrew Morton <akpm@osdl.org>
Date: Wed, 10 Aug 2005 03:53:41 +0000 (+1000)
Subject: [PATCH] ppc64: four level pagetables fix
X-Git-Tag: v2.6.14-rc1~1034^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b74d0bd53406c23636707565d87ddaa55d315b26;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h
index 5ea952ad716..c83679c9d2b 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