Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89cf2472 authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

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: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8fce141f

kernel/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,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;

	}

}