[CIQ] v6.12.29 - rebased configs

bmastbergen · bmastbergen · commit 5fbdf662cd93 · 2025-05-19T10:03:04.000-04:00
CONFIG_MITIGATION_ITS is new and enabled by default for x86 x86/its: Add support for ITS-safe indirect thunk Upstream: 16a7d5b
diff --git a/ciq/configs/kernel-x86_64-debug.config b/ciq/configs/kernel-x86_64-debug.config
@@ -580,6 +580,7 @@ CONFIG_MITIGATION_SPECTRE_V1=y
 CONFIG_MITIGATION_SPECTRE_V2=y
 CONFIG_MITIGATION_SRBDS=y
 CONFIG_MITIGATION_SSB=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
diff --git a/ciq/configs/kernel-x86_64.config b/ciq/configs/kernel-x86_64.config
@@ -577,6 +577,7 @@ CONFIG_MITIGATION_SPECTRE_V1=y
 CONFIG_MITIGATION_SPECTRE_V2=y
 CONFIG_MITIGATION_SRBDS=y
 CONFIG_MITIGATION_SSB=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #

Original file line number	Diff line number	Diff line change
`@@ -580,6 +580,7 @@ CONFIG_MITIGATION_SPECTRE_V1=y`
`580`	`580`	`CONFIG_MITIGATION_SPECTRE_V2=y`
`581`	`581`	`CONFIG_MITIGATION_SRBDS=y`
`582`	`582`	`CONFIG_MITIGATION_SSB=y`
	`583`	`+CONFIG_MITIGATION_ITS=y`
`583`	`584`	`CONFIG_ARCH_HAS_ADD_PAGES=y`
`584`	`585`
`585`	`586`	`#`
Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,7 @@ CONFIG_MITIGATION_SPECTRE_V1=y`
`577`	`577`	`CONFIG_MITIGATION_SPECTRE_V2=y`
`578`	`578`	`CONFIG_MITIGATION_SRBDS=y`
`579`	`579`	`CONFIG_MITIGATION_SSB=y`
	`580`	`+CONFIG_MITIGATION_ITS=y`
`580`	`581`	`CONFIG_ARCH_HAS_ADD_PAGES=y`
`581`	`582`
`582`	`583`	`#`