[PATCH] hugepage: Move hugetlb_free_pgd_range() prototype to hugetlb.h (3915bcf3) · Commits · 戴 / test

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>

include/asm-ia64/pgtable.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -505,9 +505,6 @@ extern struct page *zero_page_memmap_ptr;
		#define HUGETLB_PGDIR_SHIFT (HPAGE_SHIFT + 2*(PAGE_SHIFT-3))
		#define HUGETLB_PGDIR_SIZE (__IA64_UL(1) << HUGETLB_PGDIR_SHIFT)
		#define HUGETLB_PGDIR_MASK (~(HUGETLB_PGDIR_SIZE-1))
		struct mmu_gather;
		void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
		unsigned long end, unsigned long floor, unsigned long ceiling);
		#endif

		/*

include/linux/hugetlb.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,10 @@ void hugetlb_change_protection(struct vm_area_struct *vma,

		#ifndef ARCH_HAS_HUGETLB_FREE_PGD_RANGE
		#define hugetlb_free_pgd_range free_pgd_range
		#else
		void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
		unsigned long end, unsigned long floor,
		unsigned long ceiling);
		#endif

		#ifndef ARCH_HAS_PREPARE_HUGEPAGE_RANGE

Admin message