Commit b74d0bd5 authored by Andrew Morton's avatar Andrew Morton Committed by Paul Mackerras

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 40193713
...@@ -489,8 +489,10 @@ extern pgd_t swapper_pg_dir[]; ...@@ -489,8 +489,10 @@ extern pgd_t swapper_pg_dir[];
extern void paging_init(void); extern void paging_init(void);
#ifdef CONFIG_HUGETLB_PAGE
#define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \ #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \
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 * This gets called at the end of handling a page fault, when
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment