[packages/kernel/LINUX_6_6] - ITS mitigations is implicitly disabled on x86, make it explicit and fix build

[baggins]

commit eafa4fe51be50af6b88977770230197e254776f2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 22 14:44:56 2025 +0200

    - ITS mitigations is implicitly disabled on x86, make it explicit and fix build

 kernel-small_fixes.patch | 17 +++++++++++++++++
 kernel-x86.config        |  2 +-
 kernel.spec              |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 3a2181cc..41e64285 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,7 +59,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		6.6
 %define		postver		.91
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index dc2c31ff..c352ab44 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -107,3 +107,20 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacra
  
  	if (dev->msi_enabled)
 
+--- linux-6.6/arch/x86/kernel/alternative.c~	2025-05-22 14:22:36.000000000 +0200
++++ linux-6.6/arch/x86/kernel/alternative.c	2025-05-22 14:38:49.086664231 +0200
+@@ -1449,12 +1449,14 @@
+ static void poison_cfi(void *addr) { }
+ #endif
+ 
++#ifdef CONFIG_MITIGATION_ITS
+ u8 *its_static_thunk(int reg)
+ {
+ 	u8 *thunk = __x86_indirect_its_thunk_array[reg];
+ 
+ 	return thunk;
+ }
++#endif
+ 
+ #endif
+ 
diff --git a/kernel-x86.config b/kernel-x86.config
index 0c50475c..f81b19ff 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -123,7 +123,7 @@ SLS x86_64=y
 GDS_FORCE_MITIGATION x86_64=n x86=n
 MITIGATION_RFDS x86_64=y
 MITIGATION_SPECTRE_BHI x86=y x86_64=y
-MITIGATION_ITS x86=y x86_64=y
+MITIGATION_ITS x86_64=y
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/eafa4fe51be50af6b88977770230197e254776f2