diff options
author | Jan Beulich <JBeulich@suse.com> | 2014-11-03 03:15:42 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 08:08:14 -0500 |
commit | e10679825924580845c4825deaaddf5331ff627c (patch) | |
tree | c052eea779aa058de20fc1b19679188d199954ab /arch/x86/kernel/apic/io_apic.c | |
parent | 9f50c6ea0d02a58abd498250abd11bde687bbe22 (diff) |
x86: irq: Fix placement of mp_should_keep_irq()
While f3761db164 ("x86, irq: Fix build error caused by
9eabc99a635a77cbf09") addressed the original build problem,
declaration, inline stub, and definition still seem misplaced: It isn't
really IO-APIC related, and it's being used solely in arch/x86/pci/.
This also means stubbing it out when !CONFIG_X86_IO_APIC was at least
questionable.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Link: http://lkml.kernel.org/r/545747BE020000780004436E@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 7ffe0a2b870f..a157b666ac36 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -3964,18 +3964,6 @@ int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node) | |||
3964 | return ret; | 3964 | return ret; |
3965 | } | 3965 | } |
3966 | 3966 | ||
3967 | bool mp_should_keep_irq(struct device *dev) | ||
3968 | { | ||
3969 | if (dev->power.is_prepared) | ||
3970 | return true; | ||
3971 | #ifdef CONFIG_PM_RUNTIME | ||
3972 | if (dev->power.runtime_status == RPM_SUSPENDING) | ||
3973 | return true; | ||
3974 | #endif | ||
3975 | |||
3976 | return false; | ||
3977 | } | ||
3978 | |||
3979 | /* Enable IOAPIC early just for system timer */ | 3967 | /* Enable IOAPIC early just for system timer */ |
3980 | void __init pre_init_apic_IRQ0(void) | 3968 | void __init pre_init_apic_IRQ0(void) |
3981 | { | 3969 | { |