From c3b0254aa80299519ee3fcf7635407ea48efa07b Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Fri, 11 May 2018 09:58:57 -0400
Subject: Only set ARM64_ERRATUM_1024718 for aarch64

Obviously this erratum only applies to aarch64 so don't set it for other
ARM kernels.
---
 configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_1024718         | 1 -
 configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718 | 1 +
 kernel-armv7hl-debug.config                                     | 1 -
 kernel-armv7hl-lpae-debug.config                                | 1 -
 kernel-armv7hl-lpae.config                                      | 1 -
 kernel-armv7hl.config                                           | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_1024718
 create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718

diff --git a/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_1024718 b/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_1024718
deleted file mode 100644
index 1c8f6ffc8..000000000
--- a/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_1024718
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM64_ERRATUM_1024718=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718
new file mode 100644
index 000000000..1c8f6ffc8
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718
@@ -0,0 +1 @@
+CONFIG_ARM64_ERRATUM_1024718=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 51a2d779a..56dd83980 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -251,7 +251,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ZX is not set
 CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARCNET is not set
-CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
 CONFIG_ARMADA_THERMAL=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index bd0d690c3..09abfd7a8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -242,7 +242,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCNET is not set
-CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
 CONFIG_ARMADA_THERMAL=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ce2d82f21..405b9fb9e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -242,7 +242,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCNET is not set
-CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 0dc90d487..390a14cdc 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -251,7 +251,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ZX is not set
 CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARCNET is not set
-CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
-- 
cgit