The patch titled Subject: mm/hugetlb: reduce arch dependent code about hugetlb_prefault_arch_hook has been removed from the -mm tree. Its filename was mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Zhang Zhen <zhenzhang.zhang@xxxxxxxxxx> Subject: mm/hugetlb: reduce arch dependent code about hugetlb_prefault_arch_hook Currently we have many duplicates in definitions of hugetlb_prefault_arch_hook. In all architectures this function is empty. Signed-off-by: Zhang Zhen <zhenzhang.zhang@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/include/asm/hugetlb.h | 4 ---- arch/arm64/include/asm/hugetlb.h | 4 ---- arch/ia64/include/asm/hugetlb.h | 4 ---- arch/metag/include/asm/hugetlb.h | 4 ---- arch/mips/include/asm/hugetlb.h | 4 ---- arch/powerpc/include/asm/hugetlb.h | 5 ----- arch/s390/include/asm/hugetlb.h | 1 - arch/sh/include/asm/hugetlb.h | 3 --- arch/sparc/include/asm/hugetlb.h | 4 ---- arch/tile/include/asm/hugetlb.h | 4 ---- arch/x86/include/asm/hugetlb.h | 3 --- fs/hugetlbfs/inode.c | 1 - 12 files changed, 41 deletions(-) diff -puN arch/arm/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/arm/include/asm/hugetlb.h --- a/arch/arm/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/arm/include/asm/hugetlb.h @@ -53,10 +53,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline int huge_pte_none(pte_t pte) { return pte_none(pte); diff -puN arch/arm64/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/arm64/include/asm/hugetlb.h --- a/arch/arm64/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/arm64/include/asm/hugetlb.h @@ -86,10 +86,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline int huge_pte_none(pte_t pte) { return pte_none(pte); diff -puN arch/ia64/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/ia64/include/asm/hugetlb.h --- a/arch/ia64/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/ia64/include/asm/hugetlb.h @@ -20,10 +20,6 @@ static inline int is_hugepage_only_range REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE); } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) { diff -puN arch/metag/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/metag/include/asm/hugetlb.h --- a/arch/metag/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/metag/include/asm/hugetlb.h @@ -14,10 +14,6 @@ static inline int is_hugepage_only_range int prepare_hugepage_range(struct file *file, unsigned long addr, unsigned long len); -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, unsigned long floor, diff -puN arch/mips/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/mips/include/asm/hugetlb.h --- a/arch/mips/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/mips/include/asm/hugetlb.h @@ -38,10 +38,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, diff -puN arch/powerpc/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/powerpc/include/asm/hugetlb.h --- a/arch/powerpc/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/powerpc/include/asm/hugetlb.h @@ -112,11 +112,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - - static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) { diff -puN arch/s390/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/s390/include/asm/hugetlb.h --- a/arch/s390/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/s390/include/asm/hugetlb.h @@ -35,7 +35,6 @@ static inline int prepare_hugepage_range return 0; } -#define hugetlb_prefault_arch_hook(mm) do { } while (0) #define arch_clear_hugepage_flags(page) do { } while (0) int arch_prepare_hugepage(struct page *page); diff -puN arch/sh/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/sh/include/asm/hugetlb.h --- a/arch/sh/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/sh/include/asm/hugetlb.h @@ -26,9 +26,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { -} - static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, unsigned long floor, diff -puN arch/sparc/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/sparc/include/asm/hugetlb.h --- a/arch/sparc/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/sparc/include/asm/hugetlb.h @@ -11,10 +11,6 @@ void set_huge_pte_at(struct mm_struct *m pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, unsigned long len) { diff -puN arch/tile/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/tile/include/asm/hugetlb.h --- a/arch/tile/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/tile/include/asm/hugetlb.h @@ -40,10 +40,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) -{ -} - static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, unsigned long floor, diff -puN arch/x86/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook arch/x86/include/asm/hugetlb.h --- a/arch/x86/include/asm/hugetlb.h~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/arch/x86/include/asm/hugetlb.h @@ -26,9 +26,6 @@ static inline int prepare_hugepage_range return 0; } -static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { -} - static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, unsigned long floor, diff -puN fs/hugetlbfs/inode.c~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook fs/hugetlbfs/inode.c --- a/fs/hugetlbfs/inode.c~mm-hugetlb-reduce-arch-dependent-code-about-hugetlb_prefault_arch_hook +++ a/fs/hugetlbfs/inode.c @@ -130,7 +130,6 @@ static int hugetlbfs_file_mmap(struct fi goto out; ret = 0; - hugetlb_prefault_arch_hook(vma->vm_mm); if (vma->vm_flags & VM_WRITE && inode->i_size < len) inode->i_size = len; out: _ Patches currently in -mm which might be from zhenzhang.zhang@xxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html