aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/io_apic.c6
-rw-r--r--arch/x86/kernel/irqinit_32.c2
-rw-r--r--arch/x86/kernel/irqinit_64.c2
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 683610517d2a..e03bc0f87eef 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -1257,11 +1257,7 @@ static void ioapic_register_intr(int irq, unsigned long trigger)
1257{ 1257{
1258 struct irq_desc *desc; 1258 struct irq_desc *desc;
1259 1259
1260 /* first time to use this irq_desc */ 1260 desc = irq_to_desc(irq);
1261 if (irq < 16)
1262 desc = irq_to_desc(irq);
1263 else
1264 desc = irq_to_desc_alloc(irq);
1265 1261
1266 if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || 1262 if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
1267 trigger == IOAPIC_LEVEL) 1263 trigger == IOAPIC_LEVEL)
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index 9092103a18eb..a8d35998d308 100644
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -70,7 +70,7 @@ void __init init_ISA_irqs (void)
70 */ 70 */
71 for (i = 0; i < 16; i++) { 71 for (i = 0; i < 16; i++) {
72 /* first time call this irq_desc */ 72 /* first time call this irq_desc */
73 struct irq_desc *desc = irq_to_desc_alloc(i); 73 struct irq_desc *desc = irq_to_desc(i);
74 74
75 desc->status = IRQ_DISABLED; 75 desc->status = IRQ_DISABLED;
76 desc->action = NULL; 76 desc->action = NULL;
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
index d17fbc26d96f..ff0235391285 100644
--- a/arch/x86/kernel/irqinit_64.c
+++ b/arch/x86/kernel/irqinit_64.c
@@ -144,7 +144,7 @@ void __init init_ISA_irqs(void)
144 144
145 for (i = 0; i < 16; i++) { 145 for (i = 0; i < 16; i++) {
146 /* first time call this irq_desc */ 146 /* first time call this irq_desc */
147 struct irq_desc *desc = irq_to_desc_alloc(i); 147 struct irq_desc *desc = irq_to_desc(i);
148 148
149 desc->status = IRQ_DISABLED; 149 desc->status = IRQ_DISABLED;
150 desc->action = NULL; 150 desc->action = NULL;