diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/irqinit_32.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index 0c0dedccd036..c5cb769db7b0 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -53,30 +53,6 @@ static struct irqaction fpu_irq = { | |||
53 | .name = "fpu", | 53 | .name = "fpu", |
54 | }; | 54 | }; |
55 | 55 | ||
56 | static void __init init_ISA_irqs(void) | ||
57 | { | ||
58 | int i; | ||
59 | |||
60 | #ifdef CONFIG_X86_LOCAL_APIC | ||
61 | init_bsp_APIC(); | ||
62 | #endif | ||
63 | init_8259A(0); | ||
64 | |||
65 | /* | ||
66 | * 16 old-style INTA-cycle interrupts: | ||
67 | */ | ||
68 | for (i = 0; i < NR_IRQS_LEGACY; i++) { | ||
69 | struct irq_desc *desc = irq_to_desc(i); | ||
70 | |||
71 | desc->status = IRQ_DISABLED; | ||
72 | desc->action = NULL; | ||
73 | desc->depth = 1; | ||
74 | |||
75 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
76 | handle_level_irq, "XT"); | ||
77 | } | ||
78 | } | ||
79 | |||
80 | /* | 56 | /* |
81 | * IRQ2 is cascade interrupt to second interrupt controller | 57 | * IRQ2 is cascade interrupt to second interrupt controller |
82 | */ | 58 | */ |
@@ -118,6 +94,30 @@ int vector_used_by_percpu_irq(unsigned int vector) | |||
118 | return 0; | 94 | return 0; |
119 | } | 95 | } |
120 | 96 | ||
97 | static void __init init_ISA_irqs(void) | ||
98 | { | ||
99 | int i; | ||
100 | |||
101 | #ifdef CONFIG_X86_LOCAL_APIC | ||
102 | init_bsp_APIC(); | ||
103 | #endif | ||
104 | init_8259A(0); | ||
105 | |||
106 | /* | ||
107 | * 16 old-style INTA-cycle interrupts: | ||
108 | */ | ||
109 | for (i = 0; i < NR_IRQS_LEGACY; i++) { | ||
110 | struct irq_desc *desc = irq_to_desc(i); | ||
111 | |||
112 | desc->status = IRQ_DISABLED; | ||
113 | desc->action = NULL; | ||
114 | desc->depth = 1; | ||
115 | |||
116 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
117 | handle_level_irq, "XT"); | ||
118 | } | ||
119 | } | ||
120 | |||
121 | /* Overridden in paravirt.c */ | 121 | /* Overridden in paravirt.c */ |
122 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | 122 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); |
123 | 123 | ||