From: Rafael J. Wysocki Date: Sat, 13 Dec 2014 00:54:59 +0000 (+0100) Subject: x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c X-Git-Tag: firefly_0821_release~176^2~2625^2~1^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16394fd031142c9ef31e2eb8cd8c4bd07e258bac;p=firefly-linux-kernel-4.4.55.git x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks depending on CONFIG_PM_RUNTIME may now be changed to depend on CONFIG_PM. Replace CONFIG_PM_RUNTIME with CONFIG_PM in x86/kernel/apic/io_apic.c. Acked-by: Thomas Gleixner Signed-off-by: Rafael J. Wysocki --- diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 7ffe0a2b870f..a6745e756729 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3968,7 +3968,7 @@ bool mp_should_keep_irq(struct device *dev) { if (dev->power.is_prepared) return true; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM if (dev->power.runtime_status == RPM_SUSPENDING) return true; #endif