kernel: enable CONFIG_RETPOLINE on aarch64 and armv5tel

Message ID 5074b6b4-3a7e-4c31-7b47-39a3c6f4241c@ipfire.org
State New
Headers show
Series
  • kernel: enable CONFIG_RETPOLINE on aarch64 and armv5tel
Related show

Commit Message

Peter Müller June 9, 2020, 5:23 p.m. UTC
Since there seems to be no consistent position for that directive, the
current approach is rather messy as it attempts to insert it near
CONFIG_SMP (found and enabled across all architectures). When in Rome...

Fixes: #12374

Cc: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/kernel/kernel.config.aarch64-ipfire        | 1 +
 config/kernel/kernel.config.armv5tel-ipfire-multi | 1 +
 2 files changed, 2 insertions(+)

Patch

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index e0f2f6df8..8301c51bf 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -28,6 +28,7 @@  CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_SMP=y
+CONFIG_RETPOLINE=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 15183300f..1aca28d01 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -762,6 +762,7 @@  CONFIG_PCI_HOST_GENERIC=y
 CONFIG_HAVE_SMP=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
+CONFIG_RETPOLINE=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y