The patch titled
Subject: x86: convert update_mmu_cache() and update_mmu_cache_pmd() to functions
has been removed from the -mm tree. Its filename was
x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Subject: x86: convert update_mmu_cache() and update_mmu_cache_pmd() to functions
From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Converting macros to functions unhide type problems before changes will
be integrated and trigger problems on other architectures.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/pgtable.h | 12 ++++++++++++
arch/x86/include/asm/pgtable_32.h | 7 -------
arch/x86/include/asm/pgtable_64.h | 3 ---
3 files changed, 12 insertions(+), 10 deletions(-)
diff -puN arch/x86/include/asm/pgtable.h~x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions arch/x86/include/asm/pgtable.h
--- a/arch/x86/include/asm/pgtable.h~x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions
+++ a/arch/x86/include/asm/pgtable.h
@@ -781,6 +781,18 @@ static inline void clone_pgd_range(pgd_t
memcpy(dst, src, count * sizeof(pgd_t));
}
+/*
+ * The x86 doesn't have any external MMU info: the kernel page
+ * tables contain all the necessary information.
+ */
+static inline void update_mmu_cache(struct vm_area_struct *vma,
+ unsigned long addr, pte_t *ptep)
+{
+}
+static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,
+ unsigned long addr, pmd_t *pmd)
+{
+}
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
diff -puN arch/x86/include/asm/pgtable_32.h~x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions arch/x86/include/asm/pgtable_32.h
--- a/arch/x86/include/asm/pgtable_32.h~x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions
+++ a/arch/x86/include/asm/pgtable_32.h
@@ -66,13 +66,6 @@ do { \
__flush_tlb_one((vaddr)); \
} while (0)
-/*
- * The i386 doesn't have any external MMU info: the kernel page
- * tables contain all the necessary information.
- */
-#define update_mmu_cache(vma, address, ptep) do { } while (0)
-#define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)
-
#endif /* !__ASSEMBLY__ */
/*
diff -puN arch/x86/include/asm/pgtable_64.h~x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions arch/x86/include/asm/pgtable_64.h
--- a/arch/x86/include/asm/pgtable_64.h~x86-convert-update_mmu_cache-and-update_mmu_cache_pmd-to-functions
+++ a/arch/x86/include/asm/pgtable_64.h
@@ -142,9 +142,6 @@ static inline int pgd_large(pgd_t pgd) {
#define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))
#define pte_unmap(pte) ((void)(pte))/* NOP */
-#define update_mmu_cache(vma, address, ptep) do { } while (0)
-#define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)
-
/* Encode and de-code a swap entry */
#if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE
#define SWP_TYPE_BITS (_PAGE_BIT_FILE - _PAGE_BIT_PRESENT - 1)
_
Patches currently in -mm which might be from kirill.shutemov@xxxxxxxxxxxxxxx are
thp-avoid-dumping-huge-zero-page.patch
linux-next.patch
mm-huge_memory-use-new-hashtable-implementation.patch
mm-remove-unused-memclear_highpage_flush.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
