[tip:sched/core] cpu/SMT: State SMT is disabled even with nosmt and without "=force"

From: tip-bot for Borislav Petkov
Date: Fri Oct 05 2018 - 04:29:32 EST


Commit-ID: d0e7d14455d41163126afecd0fcce935463cc512
Gitweb: https://git.kernel.org/tip/d0e7d14455d41163126afecd0fcce935463cc512
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Thu, 4 Oct 2018 19:22:27 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Fri, 5 Oct 2018 10:20:31 +0200

cpu/SMT: State SMT is disabled even with nosmt and without "=force"

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@xxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20181004172227.10094-1-bp@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
kernel/cpu.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 0097acec1c71..f1338452d998 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -362,6 +362,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;
}
}