From 812d7cd6a93e653badbd40d9c310eeaaba19a314 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Jan 2021 14:45:25 +0000 Subject: [PATCH] Fix for ARMv7 builder pause issue - rhbz 1576593 regresion --- configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE | 3 +-- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel.spec | 5 ++++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE index 4f5e59821..cd440ed6d 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE +++ b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE @@ -1,2 +1 @@ -# TODO fix due to hardware errata -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index acee275ee..533207349 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2501,7 +2501,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 15089b8b7..804839fcd 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2486,7 +2486,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a21f92ca3..bec6e4c3b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2447,7 +2447,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index bf2f30383..70450f8f4 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2432,7 +2432,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel.spec b/kernel.spec index eb4db1021..fe2173c9e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -82,7 +82,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 200 +%global baserelease 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2965,6 +2965,9 @@ fi # # %changelog +* Wed Jan 20 2021 Peter Robinson - 5.10.9-201 +- Fix for ARMv7 builder pause issue + * Tue Jan 19 15:00:17 CST 2021 Justin M. Forbes - 5.10.9-200 - Linux v5.10.9