Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b74d0bd53406c23636707565d87ddaa55d315b26

Authored by Andrew Morton
Committed by Paul Mackerras
1 parent 40193713df
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

include/asm-ppc64/pgtable.h
Diff comments   View file @ b74d0bd
... ... @@ -489,8 +489,10 @@
489 489  
490 490 extern void paging_init(void);
491 491  
  492 +#ifdef CONFIG_HUGETLB_PAGE
492 493 #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \
493 494 free_pgd_range(tlb, addr, end, floor, ceiling)
  495 +#endif
494 496  
495 497 /*
496 498 * This gets called at the end of handling a page fault, when