Messages in this thread Patch in this message | | | Date | Tue, 23 May 2017 01:49:24 -0700 | From | tip-bot for Thomas Gleixner <> | Subject | [tip:sched/core] x86/smp: Adjust system_state check |
| |
Commit-ID: 719b3680d1f789c1e3054e3fcb26bfff07c3c623 Gitweb: http://git.kernel.org/tip/719b3680d1f789c1e3054e3fcb26bfff07c3c623 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 16 May 2017 20:42:35 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Tue, 23 May 2017 10:01:35 +0200
x86/smp: Adjust system_state check
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(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index f04479a..045e4f9 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -863,7 +863,7 @@ static void announce_cpu(int cpu, int apicid) 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");
| |