ACPI: Adjust system_state check
authorThomas Gleixner <tglx@linutronix.de>
Tue, 16 May 2017 18:42:38 +0000 (20:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 23 May 2017 08:01:36 +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.

Make the decision whether a pci root is hotplugged depend on SYSTEM_RUNNING
instead of !SYSTEM_BOOTING. It makes no sense to cover states greater than
SYSTEM_RUNNING as there are not hotplug events on reboot and poweroff.

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: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/20170516184735.446455652@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/acpi/pci_root.c

index 919be0aa2578760d466031f866a0e8772adf7f97..240544253ccdf276c3518d6e4cdabae45f0d0df6 100644 (file)
@@ -523,7 +523,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
        struct acpi_pci_root *root;
        acpi_handle handle = device->handle;
        int no_aspm = 0;
-       bool hotadd = system_state != SYSTEM_BOOTING;
+       bool hotadd = system_state == SYSTEM_RUNNING;
 
        root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
        if (!root)