aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/hw_irq.h2
-rw-r--r--arch/x86/kernel/apic/io_apic.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index e1acbbaf47ca..454c9e4056e6 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -132,6 +132,8 @@ struct irq_cfg {
132 }; 132 };
133}; 133};
134 134
135extern struct irq_cfg *irq_cfg(unsigned int irq);
136extern struct irq_cfg *irqd_cfg(struct irq_data *irq_data);
135extern void setup_vector_irq(int cpu); 137extern void setup_vector_irq(int cpu);
136extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *); 138extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *);
137#ifdef CONFIG_SMP 139#ifdef CONFIG_SMP
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index ab8ca9327c06..783468efa4a1 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -281,11 +281,16 @@ int __init arch_early_irq_init(void)
281 return 0; 281 return 0;
282} 282}
283 283
284static inline struct irq_cfg *irq_cfg(unsigned int irq) 284struct irq_cfg *irq_cfg(unsigned int irq)
285{ 285{
286 return irq_get_chip_data(irq); 286 return irq_get_chip_data(irq);
287} 287}
288 288
289struct irq_cfg *irqd_cfg(struct irq_data *irq_data)
290{
291 return irq_data->chip_data;
292}
293
289static struct irq_cfg *alloc_irq_cfg(unsigned int irq, int node) 294static struct irq_cfg *alloc_irq_cfg(unsigned int irq, int node)
290{ 295{
291 struct irq_cfg *cfg; 296 struct irq_cfg *cfg;