35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Tue, 16 May 2017 20:42:35 +0200
|
|
Subject: [PATCH 04/17] x86/smp: Adjust system_state check
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.11/older/patches-4.11.9-rt7.tar.xz
|
|
|
|
To enable smp_processor_id() and might_sleep() debug checks earlier, it's
|
|
required to add system states between SYSTEM_BOOTING and SYSTEM_RUNNING.
|
|
|
|
Adjust the system_state check in announce_cpu() to handle the extra states.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
|
|
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
|
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Link: http://lkml.kernel.org/r/20170516184735.191715856@linutronix.de
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
---
|
|
arch/x86/kernel/smpboot.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/x86/kernel/smpboot.c
|
|
+++ b/arch/x86/kernel/smpboot.c
|
|
@@ -863,7 +863,7 @@ static void announce_cpu(int cpu, int ap
|
|
if (cpu == 1)
|
|
printk(KERN_INFO "x86: Booting SMP configuration:\n");
|
|
|
|
- if (system_state == SYSTEM_BOOTING) {
|
|
+ if (system_state < SYSTEM_RUNNING) {
|
|
if (node != current_node) {
|
|
if (current_node > (-1))
|
|
pr_cont("\n");
|