extable: Adjust system_state checks
authorThomas Gleixner <tglx@linutronix.de>
Tue, 16 May 2017 18:42:44 +0000 (20:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 23 May 2017 08:01:37 +0000 (10:01 +0200)
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 core_kernel_text() to handle the extra
states, i.e. to cover init text up to the point where the system switches
to state RUNNING.

Tested-by: Mark Rutland <mark.rutland@arm.com>
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: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170516184735.949992741@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/extable.c

index 2676d7f..0fbdd85 100644 (file)
@@ -75,7 +75,7 @@ int core_kernel_text(unsigned long addr)
            addr < (unsigned long)_etext)
                return 1;
 
-       if (system_state == SYSTEM_BOOTING &&
+       if (system_state < SYSTEM_RUNNING &&
            init_kernel_text(addr))
                return 1;
        return 0;