tree 6f4245e1363b7cf5e74d84cd025ad804eeb04bfe
parent 40193713df2cdb9c233b3fc2029ecdccb40cb1e4
author Andrew Morton <[EMAIL PROTECTED]> Wed, 10 Aug 2005 13:53:41 +1000
committer Paul Mackerras <[EMAIL PROTECTED]> Tue, 30 Aug 2005 12:08:10 +1000
[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 <[EMAIL PROTECTED]>
Signed-off-by: David Gibson <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
include/asm-ppc64/pgtable.h | 2 ++
1 files changed, 2 insertions(+)
diff --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h
--- 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
