aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2014-11-03 03:15:42 -0500
committerThomas Gleixner <tglx@linutronix.de>2014-12-16 08:08:14 -0500
commite10679825924580845c4825deaaddf5331ff627c (patch)
treec052eea779aa058de20fc1b19679188d199954ab /arch/x86/pci
parent9f50c6ea0d02a58abd498250abd11bde687bbe22 (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/pci')
-rw-r--r--arch/x86/pci/irq.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index eb500c2592ad..cb50e281d838 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -1254,6 +1254,18 @@ static int pirq_enable_irq(struct pci_dev *dev)
1254 return 0; 1254 return 0;
1255} 1255}
1256 1256
1257bool mp_should_keep_irq(struct device *dev)
1258{
1259 if (dev->power.is_prepared)
1260 return true;
1261#ifdef CONFIG_PM_RUNTIME
1262 if (dev->power.runtime_status == RPM_SUSPENDING)
1263 return true;
1264#endif
1265
1266 return false;
1267}
1268
1257static void pirq_disable_irq(struct pci_dev *dev) 1269static void pirq_disable_irq(struct pci_dev *dev)
1258{ 1270{
1259 if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) && 1271 if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&