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

Download as
Browse Code ยป

Commit 3915bcf38fe0b6d130b4bbde97804f29a0becf32

Authored by David Gibson
Committed by Linus Torvalds
1 parent 4866920b93
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] hugepage: Move hugetlb_free_pgd_range() prototype to hugetlb.h 

The optional hugepage callback, hugetlb_free_pgd_range() is presently
implemented non-trivially only on ia64 (but I plan to add one for powerpc
shortly).  It has its own prototype for the function in asm-ia64/pgtable.h.
 However, since the function is called from generic code, it make sense for
its prototype to be in the generic hugetlb.h header file, as the protypes
other arch callbacks already are (prepare_hugepage_range(),
set_huge_pte_at(), etc.).  This patch makes it so.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 4 additions and 3 deletions Side-by-side Diff

include/asm-ia64/pgtable.h
Diff comments   View file @ 3915bcf
... ... @@ -505,9 +505,6 @@
505 505 #define HUGETLB_PGDIR_SHIFT (HPAGE_SHIFT + 2*(PAGE_SHIFT-3))
506 506 #define HUGETLB_PGDIR_SIZE (__IA64_UL(1) << HUGETLB_PGDIR_SHIFT)
507 507 #define HUGETLB_PGDIR_MASK (~(HUGETLB_PGDIR_SIZE-1))
508   -struct mmu_gather;
509   -void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
510   - unsigned long end, unsigned long floor, unsigned long ceiling);
511 508 #endif
512 509  
513 510 /*
include/linux/hugetlb.h
Diff comments   View file @ 3915bcf
... ... @@ -47,6 +47,10 @@
47 47  
48 48 #ifndef ARCH_HAS_HUGETLB_FREE_PGD_RANGE
49 49 #define hugetlb_free_pgd_range free_pgd_range
  50 +#else
  51 +void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
  52 + unsigned long end, unsigned long floor,
  53 + unsigned long ceiling);
50 54 #endif
51 55  
52 56 #ifndef ARCH_HAS_PREPARE_HUGEPAGE_RANGE