diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-13 01:54:59 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-13 02:07:36 +0100 |
| commit | 16394fd031142c9ef31e2eb8cd8c4bd07e258bac (patch) | |
| tree | 241dbefcd16b28d4a077d8196b84262596233a4b /arch/x86/kernel | |
| parent | 40bd62c6194bdee1bc6652b3b0aa28e34883f603 (diff) | |
| download | op-kernel-dev-16394fd031142c9ef31e2eb8cd8c4bd07e258bac.zip op-kernel-dev-16394fd031142c9ef31e2eb8cd8c4bd07e258bac.tar.gz | |
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 <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 7ffe0a2..a6745e7 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 |
