From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 14 Dec 2022 11:34:55 +0000 (+0000)
Subject: kernel: Enable SLS on x86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5a0ffd85fc40a2b6a73152bf3562ad13ff991cd;p=ipfire-3.x.git

kernel: Enable SLS on x86

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/kernel/config-x86_64-generic b/kernel/config-x86_64-generic
index 97e1ab857..938305d53 100644
--- a/kernel/config-x86_64-generic
+++ b/kernel/config-x86_64-generic
@@ -202,7 +202,7 @@ CONFIG_RETHUNK=y
 CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CPU_IBPB_ENTRY=y
 CONFIG_CPU_IBRS_ENTRY=y
-# CONFIG_SLS is not set
+CONFIG_SLS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index c3bc298c7..33f129582 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 6.0.6
-release    = 0.25
+release    = 0.26
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>