diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-02 17:32:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-02 17:32:50 +0300 |
| commit | a2c9c3581a75382ba468ba865c9d31c60cc884b3 (patch) | |
| tree | 058ddabba23d052f9d4fad4256de7e113767c3b7 /kernel/cpu.c | |
| parent | ba5daf9b30e7a60335ba59f85a0d611008aea025 (diff) | |
| parent | 5697d159afef8c475f13a0b7b85f09bd4578106c (diff) | |
| download | linux-a2c9c3581a75382ba468ba865c9d31c60cc884b3.tar.xz | |
Merge v6.6.30
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 92429104bbf8..2dd2fd300e91 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -3208,8 +3208,8 @@ enum cpu_mitigations { }; static enum cpu_mitigations cpu_mitigations __ro_after_init = - IS_ENABLED(CONFIG_SPECULATION_MITIGATIONS) ? CPU_MITIGATIONS_AUTO : - CPU_MITIGATIONS_OFF; + IS_ENABLED(CONFIG_CPU_MITIGATIONS) ? CPU_MITIGATIONS_AUTO : + CPU_MITIGATIONS_OFF; static int __init mitigations_parse_cmdline(char *arg) { |