From 84d8928027d5748964b3af073c5c0b350d6d543b Mon Sep 17 00:00:00 2001 From: Manuel Diewald Date: Thu, 16 May 2024 15:26:20 +0200 Subject: [PATCH] UBUNTU: [Config] updateconfigs to enable new MITIGATION_SPECTRE_BHI BugLink: https://bugs.launchpad.net/bugs/2065912 Replace obsolete CONFIG_SPECTRE_BHI_* with CONFIG_MITIGATION_SPECTRE_BHI and enable mitigation by default, since 'auto' mitigation will be removed and is no longer supported upstream. Mitigation can still be turned off via the kernel command line. Signed-off-by: Manuel Diewald Signed-off-by: Roxana Nicolescu --- debian.master/config/annotations | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 6495e9ccd2dd..251beab61ed1 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8031,6 +8031,7 @@ CONFIG_MISDN_SPEEDFAX policy<{'amd64': 'm', 'arm64': ' CONFIG_MISDN_W6692 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY policy<{'arm64': 'y'}> CONFIG_MITIGATION_RFDS policy<{'amd64': 'y'}> +CONFIG_MITIGATION_SPECTRE_BHI policy<{'amd64': 'y'}> CONFIG_MK8 policy<{'amd64': 'n'}> CONFIG_MKISS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MLX4_CORE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> @@ -13225,8 +13226,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK policy<{'amd64': 'm', 'arm64': ' CONFIG_SPEAKUP_SYNTH_SOFT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_SPEAKUP_SYNTH_SPKOUT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_SPEAKUP_SYNTH_TXPRT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> -CONFIG_SPECTRE_BHI_OFF policy<{'amd64': 'n'}> -CONFIG_SPECTRE_BHI_ON policy<{'amd64': 'n'}> CONFIG_SPECULATION_MITIGATIONS policy<{'amd64': 'y'}> CONFIG_SPI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'n'}> CONFIG_SPI_ALTERA policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>