Commit 20f6b19e authored by Len Brown's avatar Len Brown

ACPI] Delete IRQ2 "cascade" in ACPI IOAPIC mode

no such concept exists in ACPI, frees IRQ2 for use.
parent 72c550fc
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/acpi.h>
#include <asm/arch_hooks.h> #include <asm/arch_hooks.h>
/** /**
...@@ -43,6 +44,7 @@ void __init intr_init_hook(void) ...@@ -43,6 +44,7 @@ void __init intr_init_hook(void)
apic_intr_init(); apic_intr_init();
#endif #endif
if (!acpi_ioapic)
setup_irq(2, &irq2); setup_irq(2, &irq2);
} }
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/acpi.h>
#include <asm/arch_hooks.h> #include <asm/arch_hooks.h>
/** /**
...@@ -17,8 +18,7 @@ ...@@ -17,8 +18,7 @@
* the "ordinary" interrupt call gates. For legacy reasons, the ISA * the "ordinary" interrupt call gates. For legacy reasons, the ISA
* interrupts should be initialised here if the machine emulates a PC * interrupts should be initialised here if the machine emulates a PC
* in any way. * in any way.
**/ **/void __init pre_intr_init_hook(void)
void __init pre_intr_init_hook(void)
{ {
init_ISA_irqs(); init_ISA_irqs();
} }
...@@ -43,6 +43,7 @@ void __init intr_init_hook(void) ...@@ -43,6 +43,7 @@ void __init intr_init_hook(void)
apic_intr_init(); apic_intr_init();
#endif #endif
if (!acpi_ioapic)
setup_irq(2, &irq2); setup_irq(2, &irq2);
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/acpi.h>
#include <asm/arch_hooks.h> #include <asm/arch_hooks.h>
void __init pre_intr_init_hook(void) void __init pre_intr_init_hook(void)
...@@ -24,6 +25,7 @@ void __init intr_init_hook(void) ...@@ -24,6 +25,7 @@ void __init intr_init_hook(void)
smp_intr_init(); smp_intr_init();
#endif #endif
if (!acpi_ioapic)
setup_irq(2, &irq2); setup_irq(2, &irq2);
} }
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <asm/acpi.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -490,5 +491,6 @@ void __init init_IRQ(void) ...@@ -490,5 +491,6 @@ void __init init_IRQ(void)
*/ */
setup_timer(); setup_timer();
if (!acpi_ioapic)
setup_irq(2, &irq2); setup_irq(2, &irq2);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment