kernel: Enable IBT on x86

This change has recently been made in IPFire 2 and is being backported
in this patch.

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

diff --git a/kernel/config-x86_64-generic b/kernel/config-x86_64-generic
index 0000de0379719f7eb72f457325f4b2bb96afcc80..f221037f39b9b84f2b937f383a79901c3ea7ddea 100644 (file)
--- a/kernel/config-x86_64-generic
+++ b/kernel/config-x86_64-generic
@@ -164,7 +164,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_X86_UMIP=y
 CONFIG_CC_HAS_IBT=y
-# CONFIG_X86_KERNEL_IBT is not set
+CONFIG_X86_KERNEL_IBT=y
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index c205dc857e9e98104e3c3d59feaa2665b8913cef..642fb22eec09581d81720e7e7c20820bbb033d9a 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 6.4.3
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>