diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 02:18:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 02:18:06 +0000 |
| commit | dbbf0dcdfc9a5d90d5146bb195fce97064d92c76 (patch) | |
| tree | bab1434b47a284ca2893dcc0b908d1b95d982e7c /kernel/cpu.c | |
| parent | Adding upstream version 6.1.85. (diff) | |
| download | linux-b1e7df05df71d5c4d3f097048ef06d541a2262b3.tar.xz linux-b1e7df05df71d5c4d3f097048ef06d541a2262b3.zip | |
Adding upstream version 6.1.90.upstream/6.1.90upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index e6f010194..e0e09b700 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2788,7 +2788,8 @@ enum cpu_mitigations { }; static enum cpu_mitigations cpu_mitigations __ro_after_init = - CPU_MITIGATIONS_AUTO; + IS_ENABLED(CONFIG_CPU_MITIGATIONS) ? CPU_MITIGATIONS_AUTO : + CPU_MITIGATIONS_OFF; static int __init mitigations_parse_cmdline(char *arg) { |