summaryrefslogtreecommitdiffstats
path: root/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
commitd0b8941357b7ce0c26d19376bc4d827042d6bb12 (patch)
tree61138493dd96ee303830bc148d607fb915562b77 /0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
parentf7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff)
parentdadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff)
downloadkernel-5.8.0-0.rc1.1.vanilla.1.fc32.tar.gz
kernel-5.8.0-0.rc1.1.vanilla.1.fc32.tar.xz
kernel-5.8.0-0.rc1.1.vanilla.1.fc32.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.1.vanilla.1.fc33kernel-5.8.0-0.rc1.1.vanilla.1.fc32kernel-5.8.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to '0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch')
-rw-r--r--0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
index 711031703..498ffaf18 100644
--- a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
+++ b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
@@ -11,7 +11,7 @@ Signed-off-by: Jon Masters <jcm@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index bbac2867062d..5a50e9f5a485 100644
+index 2ac74904a3ce..f0094424f76a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1549,9 +1549,9 @@ config HIGHMEM