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

Obviously this erratum only applies to aarch64 so don't set it for other
ARM kernels.
---
 baseconfig/arm/{ => aarch64}/CONFIG_ARM64_ERRATUM_1024718 | 0
 kernel-armv7hl-debug.config                               | 1 -
 kernel-armv7hl-lpae-debug.config                          | 1 -
 kernel-armv7hl-lpae.config                                | 1 -
 kernel-armv7hl.config                                     | 1 -
 5 files changed, 4 deletions(-)
 rename baseconfig/arm/{ => aarch64}/CONFIG_ARM64_ERRATUM_1024718 (100%)

diff --git a/baseconfig/arm/CONFIG_ARM64_ERRATUM_1024718 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718
similarity index 100%
rename from baseconfig/arm/CONFIG_ARM64_ERRATUM_1024718
rename to baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_1024718
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5f02c76b4..c4dc552b6 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 42f534f75..30f59162f 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 e80b9362d..e5c4e1f78 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 02e6a8c98..4dcbd71dd 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