The patch titled
Subject: mm-clarify-that-the-function-operates-on-hugepage-pte-v5
has been removed from the -mm tree. Its filename was
mm-clarify-that-the-function-operates-on-hugepage-pte-v5.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Subject: mm-clarify-that-the-function-operates-on-hugepage-pte-v5
Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/s390/include/asm/pgtable.h | 2 +-
include/asm-generic/pgtable.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff -puN arch/s390/include/asm/pgtable.h~mm-clarify-that-the-function-operates-on-hugepage-pte-v5 arch/s390/include/asm/pgtable.h
--- a/arch/s390/include/asm/pgtable.h~mm-clarify-that-the-function-operates-on-hugepage-pte-v5
+++ a/arch/s390/include/asm/pgtable.h
@@ -1552,7 +1552,7 @@ static inline pmd_t pmdp_collapse_flush(
unsigned long address,
pmd_t *pmdp)
{
- return pmdp_get_and_clear(vma->vm_mm, address, pmdp);
+ return pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);
}
#define pmdp_collapse_flush pmdp_collapse_flush
diff -puN include/asm-generic/pgtable.h~mm-clarify-that-the-function-operates-on-hugepage-pte-v5 include/asm-generic/pgtable.h
--- a/include/asm-generic/pgtable.h~mm-clarify-that-the-function-operates-on-hugepage-pte-v5
+++ a/include/asm-generic/pgtable.h
@@ -195,10 +195,14 @@ static inline pmd_t pmdp_collapse_flush(
unsigned long address,
pmd_t *pmdp)
{
+ /*
+ * pmd and hugepage pte formats are the same. So we could use the same
+ * function.
+ */
pmd_t pmd;
VM_BUG_ON(address & ~HPAGE_PMD_MASK);
VM_BUG_ON(pmd_trans_huge(*pmdp));
- pmd = pmdp_get_and_clear(vma->vm_mm, address, pmdp);
+ pmd = pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);
flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
return pmd;
}
_
Patches currently in -mm which might be from aneesh.kumar@xxxxxxxxxxxxxxxxxx are
origin.patch
tracing-mm-dont-trace-kmem_cache_free-on-offline-cpus.patch
mm-hugetlb-reduce-arch-dependent-code-about-huge_pmd_unshare.patch
page-flags-trivial-cleanup-for-pagetrans-helpers.patch
page-flags-introduce-page-flags-policies-wrt-compound-pages.patch
page-flags-define-pg_locked-behavior-on-compound-pages.patch
page-flags-define-behavior-of-fs-io-related-flags-on-compound-pages.patch
page-flags-define-behavior-of-lru-related-flags-on-compound-pages.patch
page-flags-define-behavior-slb-related-flags-on-compound-pages.patch
page-flags-define-behavior-of-xen-related-flags-on-compound-pages.patch
page-flags-define-pg_reserved-behavior-on-compound-pages.patch
page-flags-define-pg_swapbacked-behavior-on-compound-pages.patch
page-flags-define-pg_swapcache-behavior-on-compound-pages.patch
page-flags-define-pg_mlocked-behavior-on-compound-pages.patch
page-flags-define-pg_uncached-behavior-on-compound-pages.patch
page-flags-define-pg_uptodate-behavior-on-compound-pages.patch
page-flags-look-on-head-page-if-the-flag-is-encoded-in-page-mapping.patch
mm-sanitize-page-mapping-for-tail-pages.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
