diff options
author | Borislav Petkov <bp@suse.de> | 2018-10-04 20:22:27 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-25 11:53:32 +0300 |
commit | 6270cc3754f9d94fdf42d859c1acfa5ced8ef08b (patch) | |
tree | 36343b57b5688a6bfaa284fad3cfd20fc362e326 | |
parent | 3f3f2f4d865d36697d5976927da82cb6c6fecc9b (diff) | |
download | linux-6270cc3754f9d94fdf42d859c1acfa5ced8ef08b.tar.xz |
cpu/SMT: State SMT is disabled even with nosmt and without "=force"
[ Upstream commit d0e7d14455d41163126afecd0fcce935463cc512 ]
When booting with "nosmt=force" a message is issued into dmesg to
confirm that SMT has been force-disabled but such a message is not
issued when only "nosmt" is on the kernel command line.
Fix that.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20181004172227.10094-1-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | kernel/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 0ed3e9deda30..c2573e858009 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -379,6 +379,7 @@ void __init cpu_smt_disable(bool force) pr_info("SMT: Force disabled\n"); cpu_smt_control = CPU_SMT_FORCE_DISABLED; } else { + pr_info("SMT: disabled\n"); cpu_smt_control = CPU_SMT_DISABLED; } } |