From: Arnd Bergmann <[email protected]>

CONFIG_HIGHPTE was added in linux-2.6.32, a few years before 64-bit
support. At the time it made sense, as the CONFIG_ARM_LPAE option allowed
systems with 16GB of memory that made lowmem a particularly scarce
resource, and the HIGHPTE implementation gave feature parity with 32-bit
x86 and frv machines.

Since Arm is the last architecture remaining that uses this, and almost
no 32-bit machines support more than 4GB of RAM, the cost of continuing
to maintain HIGHPTE seems unjustified, so remove it here to allow
simplifying the generic page table handling.

Link: https://lore.kernel.org/lkml/[email protected]/T/#u
Acked-by: Lorenzo Stoakes (ARM) <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
 arch/arm/Kconfig                        | 11 -----------
 arch/arm/configs/vt8500_v6_v7_defconfig |  1 -
 arch/arm/include/asm/pgalloc.h          | 13 +++----------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fd01ccab9c12..fc66d52d847e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1225,17 +1225,6 @@ config HIGHMEM
 
          If unsure, say n.
 
-config HIGHPTE
-       bool "Allocate 2nd-level pagetables from highmem" if EXPERT
-       depends on HIGHMEM && !PREEMPT_RT
-       default y
-       help
-         The VM uses one page of physical memory for each page table.
-         For systems with a lot of processes, this can use a lot of
-         precious low memory, eventually leading to low memory being
-         consumed by page tables.  Setting this option will allow
-         user-space 2nd level page tables to reside in high memory.
-
 config ARM_PAN
        bool "Enable privileged no-access"
        depends on MMU
diff --git a/arch/arm/configs/vt8500_v6_v7_defconfig 
b/arch/arm/configs/vt8500_v6_v7_defconfig
index 2925a1f1dbb6..33a81c5a84d0 100644
--- a/arch/arm/configs/vt8500_v6_v7_defconfig
+++ b/arch/arm/configs/vt8500_v6_v7_defconfig
@@ -9,7 +9,6 @@ CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_VFP=y
diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
index a17f01235c29..b01d817fecf3 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
@@ -85,22 +85,15 @@ pte_alloc_one_kernel(struct mm_struct *mm)
        return pte;
 }
 
-#ifdef CONFIG_HIGHPTE
-#define PGTABLE_HIGHMEM __GFP_HIGHMEM
-#else
-#define PGTABLE_HIGHMEM 0
-#endif
-
 static inline pgtable_t
 pte_alloc_one(struct mm_struct *mm)
 {
        struct page *pte;
 
-       pte = __pte_alloc_one(mm, GFP_PGTABLE_USER | PGTABLE_HIGHMEM);
-       if (!pte)
-               return NULL;
-       if (!PageHighMem(pte))
+       pte = __pte_alloc_one(mm, GFP_PGTABLE_USER);
+       if (pte)
                clean_pte_table(page_address(pte));
+
        return pte;
 }
 
-- 
2.53.0


Reply via email to