From 1922b0a1aa97165a7ffe3b742ed90b58e98a1503 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Feb 16 2021 22:19:12 +0000
Subject: Early boot fix for UEFI on ARMv7 (rhbz 1929353)


---

diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index ce04da3..4f3088e 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1460,7 +1460,8 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
-CONFIG_DEBUG_HIGHMEM=y
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_KMAP_LOCAL is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
@@ -4769,7 +4770,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=16
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index a682793..0c2141d 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1428,7 +1428,8 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
-CONFIG_DEBUG_HIGHMEM=y
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_KMAP_LOCAL is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
@@ -4667,7 +4668,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=16
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel.spec b/kernel.spec
index 6ac4e0c..d97d48b 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -111,7 +111,7 @@ Summary: The Linux kernel
 %define patchlevel 11
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 155%{?buildid}%{?dist}
+%define specrelease 156%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -2762,6 +2762,9 @@ fi
 #
 #
 %changelog
+* Tue Feb 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 5.11.0-156
+- Early boot fix for UEFI on ARMv7 (rhbz 1929353)
+
 * Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-155]
 - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)