38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From dcd2e4734b428709984e2fa35ebbd6cccc246d47 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Tue, 16 May 2017 20:42:36 +0200
|
|
Subject: [PATCH 05/17] metag: Adjust system_state check
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.11/older/patches-4.11.5-rt1.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 stop_this_cpu() to handle the extra states.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
|
|
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Cc: James Hogan <james.hogan@imgtec.com>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Steven Rostedt <rostedt@goodmis.org>
|
|
Link: http://lkml.kernel.org/r/20170516184735.283420315@linutronix.de
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
---
|
|
arch/metag/kernel/smp.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/arch/metag/kernel/smp.c
|
|
+++ b/arch/metag/kernel/smp.c
|
|
@@ -567,8 +567,7 @@ static void stop_this_cpu(void *data)
|
|
{
|
|
unsigned int cpu = smp_processor_id();
|
|
|
|
- if (system_state == SYSTEM_BOOTING ||
|
|
- system_state == SYSTEM_RUNNING) {
|
|
+ if (system_state <= SYSTEM_RUNNING) {
|
|
spin_lock(&stop_lock);
|
|
pr_crit("CPU%u: stopping\n", cpu);
|
|
dump_stack();
|