From ce4ce5d093b7ce68638a69c9e0491470bd95d48d Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: May 16 2018 01:48:55 +0000
Subject: Only set ARM64_ERRATUM_1024718 for aarch64


Obviously this erratum only applies to aarch64 so don't set it for other
ARM kernels.

---

diff --git a/baseconfig/arm/CONFIG_ARM64_ERRATUM_1024718 b/baseconfig/arm/CONFIG_ARM64_ERRATUM_1024718
deleted file mode 100644
index 1c8f6ff..0000000
--- a/baseconfig/arm/CONFIG_ARM64_ERRATUM_1024718
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM64_ERRATUM_1024718=y
diff --git a/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718
new file mode 100644
index 0000000..1c8f6ff
--- /dev/null
+++ b/baseconfig/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 3d23108..144837c 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 300cc85..22ad884 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 a9e4fb8..6244242 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 2cdc554..1aa4472 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