diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-08-10 13:53:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-30 12:08:10 +1000 |
| commit | b74d0bd53406c23636707565d87ddaa55d315b26 (patch) | |
| tree | 6f4245e1363b7cf5e74d84cd025ad804eeb04bfe /include/asm-ppc64 | |
| parent | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (diff) | |
| download | blackbird-op-linux-b74d0bd53406c23636707565d87ddaa55d315b26.tar.gz blackbird-op-linux-b74d0bd53406c23636707565d87ddaa55d315b26.zip | |
[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/asm-ppc64')
| -rw-r--r-- | include/asm-ppc64/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h index 5ea952ad7164..c83679c9d2b0 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 |
