mm-merge-pte_mkhuge-call-into-arch_make_huge_pte.patch removed from -mm tree
The patch titled
Subject: mm: merge pte_mkhuge() call into arch_make_huge_pte()
has been removed from the -mm tree. Its filename was
mm-merge-pte_mkhuge-call-into-arch_make_huge_pte.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Anshuman Khandual <[email protected]>
Subject: mm: merge pte_mkhuge() call into arch_make_huge_pte()
Each call into pte_mkhuge() is invariably followed by arch_make_huge_pte(). Instead arch_make_huge_pte() can accommodate pte_mkhuge() at the beginning. This updates generic fallback stub for arch_make_huge_pte() and available platforms definitions. This makes huge pte creation much cleaner and easier to follow.
---
arch/arm64/mm/hugetlbpage.c | 1 + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 4 ++-- arch/sparc/mm/hugetlbpage.c | 1 + include/linux/hugetlb.h | 2 +- mm/hugetlb.c | 3 +-- mm/vmalloc.c | 1 - 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/mm/hugetlbpage.c renamed from arch/arm64/mm/hugetlbpage.c~mm-merge-pte_mkhuge-call-into-arch_make_huge_pte +1 -0
@@ -347,6 +347,7 @@ pte_t arch_make_huge_pte(pte_t entry, un {size_t pagesize =1UL << shift; + entry =pte_mkhuge (entry);if (pagesize ==CONT_PTE_SIZE ) { entry =pte_mkcont (entry); }else if (pagesize ==CONT_PMD_SIZE ) {
arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h renamed from arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h~mm-merge-pte_mkhuge-call-into-arch_make_huge_pte +2 -2
@@ -71,9 +71,9 @@ static inline pte_t arch_make_huge_pte(psize_t size =1UL << shift;if (size ==SZ_16K ) -return __pte (pte_val (entry) & ~_PAGE_HUGE); +return __pte (pte_val (entry) | _PAGE_SPS);else - return entry; + return __pte(pte_val(entry) | _PAGE_SPS | _PAGE_HUGE); }#define arch_make_huge_pte arch_make_huge_pte#endif
arch/sparc/mm/hugetlbpage.c renamed from arch/sparc/mm/hugetlbpage.c~mm-merge-pte_mkhuge-call-into-arch_make_huge_pte +1 -0
@@ -181,6 +181,7 @@ pte_t arch_make_huge_pte(pte_t entry, un {pte_t pte; + entry =pte_mkhuge (entry); pte =hugepage_shift_to_tte (entry, shift);#ifdef CONFIG_SPARC64
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-merge-pte_mkhuge-call-into-arch_make_huge_pte +1 -1
@@ -754,7 +754,7 @@ static inline void arch_clear_hugepage_fstatic inline pte_t arch_make_huge_pte (pte_t entry,unsigned int shift,vm_flags_t flags) { -return entry; +return pte_mkhuge (entry); }#endif
mm/hugetlb.c renamed from mm/hugetlb.c~mm-merge-pte_mkhuge-call-into-arch_make_huge_pte +1 -2
@@ -4637,7 +4637,6 @@ static pte_t make_huge_pte(struct vm_are vma->vm_page_prot)); } entry =pte_mkyoung (entry); - entry =pte_mkhuge (entry); entry =arch_make_huge_pte (entry, shift, vma->vm_flags);return entry;
@@ -6171,7 +6170,7 @@ unsigned long hugetlb_change_protection(unsigned int shift =huge_page_shift (hstate_vma (vma)); old_pte =huge_ptep_modify_prot_start (vma, address, ptep); - pte =pte_mkhuge (huge_pte_modify (old_pte, newprot)); + pte =huge_pte_modify (old_pte, newprot); pte =arch_make_huge_pte (pte, shift, vma->vm_flags);huge_ptep_modify_prot_commit (vma, address, ptep, old_pte, pte); pages++;
mm/vmalloc.c renamed from mm/vmalloc.c~mm-merge-pte_mkhuge-call-into-arch_make_huge_pte +0 -1
@@ -118,7 +118,6 @@ static int vmap_pte_range(pmd_t *pmd, unif (size !=PAGE_SIZE ) {pte_t entry =pfn_pte (pfn, prot); - entry =pte_mkhuge (entry); entry =arch_make_huge_pte (entry,ilog2 (size),0 );set_huge_pte_at (&init_mm, addr, pte, entry); pfn +=PFN_DOWN (size);
_
Patches currently in -mm which might be from [email protected] are
mm-migration-add-trace-events-for-thp-migrations.patch mm-migration-add-trace-events-for-base-page-and-hugetlb-migrations.patch mm-generalize-arch_has_filter_pgprot.patch