diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
commit | 5403e7c67e6625df392da2438d02c70442fd1952 (patch) | |
tree | 988c327386789b1b9fefe7ba1cebed2c7a387b32 /arm-make-highpte-not-expert.patch | |
parent | b1e22a960e2a6f39797e7d2022994df2176ad1e9 (diff) | |
parent | 0310b312a7e5dffcdf24ae835ed732f7a6a9c471 (diff) | |
download | kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.gz kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.xz kernel-5403e7c67e6625df392da2438d02c70442fd1952.zip |
blindly merge master, no adjustments to the new world order yet
Diffstat (limited to 'arm-make-highpte-not-expert.patch')
-rw-r--r-- | arm-make-highpte-not-expert.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arm-make-highpte-not-expert.patch b/arm-make-highpte-not-expert.patch deleted file mode 100644 index 09630fda1..000000000 --- a/arm-make-highpte-not-expert.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 19908e5fe3e63ed2d39f0a8a9135f35fd428d766 Mon Sep 17 00:00:00 2001 -From: Jon Masters <jcm@redhat.com> -Date: Thu, 18 Jul 2019 15:47:26 -0400 -Subject: [PATCH] arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT - -We will use this to force CONFIG_HIGHPTE off on LPAE for now - -Signed-off-by: Jon Masters <jcm@redhat.com> ---- - arch/arm/Kconfig | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 2bf1ce39a96d..e792b3e60095 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1644,9 +1644,9 @@ config HIGHMEM - If unsure, say n. - - config HIGHPTE -- bool "Allocate 2nd-level pagetables from highmem" if EXPERT -+ bool "Allocate 2nd-level pagetables from highmem" - depends on HIGHMEM -- default y -+ default n - 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 --- -2.17.2 - |