The patch titled
Subject: arm64-mm-implement-pte_devmap-support-fix
has been removed from the -mm tree. Its filename was
arm64-mm-implement-pte_devmap-support-fix.patch
This patch was dropped because it was folded into arm64-mm-implement-pte_devmap-support.patch
------------------------------------------------------
From: Robin Murphy <robin.murphy@xxxxxxx>
Subject: arm64-mm-implement-pte_devmap-support-fix
fix to build correctly under all combinations of CONFIG_PGTABLE_LEVELS and
CONFIG_TRANSPARENT_HUGEPAGE
Link: http://lkml.kernel.org/r/13026c4e64abc17133bbfa07d7731ec6691c0bcd.1559050949.git.robin.murphy@xxxxxxx
Signed-off-by: Robin Murphy <robin.murphy@xxxxxxx>
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
Cc: Jerome Glisse <jglisse@xxxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Oliver O'Halloran <oohall@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm64/include/asm/pgtable.h | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
--- a/arch/arm64/include/asm/pgtable.h~arm64-mm-implement-pte_devmap-support-fix
+++ a/arch/arm64/include/asm/pgtable.h
@@ -394,7 +394,9 @@ static inline int pmd_protnone(pmd_t pmd
#define pmd_mkhuge(pmd) (__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
#define pmd_devmap(pmd) pte_devmap(pmd_pte(pmd))
+#endif
#define pmd_mkdevmap(pmd) pte_pmd(pte_mkdevmap(pmd_pte(pmd)))
#define __pmd_to_phys(pmd) __pte_to_phys(pmd_pte(pmd))
@@ -553,11 +555,6 @@ static inline phys_addr_t pud_page_paddr
return __pud_to_phys(pud);
}
-static inline int pud_devmap(pud_t pud)
-{
- return 0;
-}
-
/* Find an entry in the second-level page table. */
#define pmd_index(addr) (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
@@ -645,11 +642,6 @@ static inline phys_addr_t pgd_page_paddr
#define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd))
-static inline int pgd_devmap(pgd_t pgd)
-{
- return 0;
-}
-
/* to find an entry in a page-table-directory */
#define pgd_index(addr) (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
@@ -692,6 +684,16 @@ static inline int pmdp_set_access_flags(
{
return ptep_set_access_flags(vma, address, (pte_t *)pmdp, pmd_pte(entry), dirty);
}
+
+static inline int pud_devmap(pud_t pud)
+{
+ return 0;
+}
+
+static inline int pgd_devmap(pgd_t pgd)
+{
+ return 0;
+}
#endif
/*
_
Patches currently in -mm which might be from robin.murphy@xxxxxxx are
mm-clean-up-is_device__page-definitions.patch
mm-introduce-arch_has_pte_devmap.patch
arm64-mm-implement-pte_devmap-support.patch
