leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: unify init_ISA_irqs() in irqinit_{32,64}.c

Browse Source 
Impact: cleanup

Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Pekka Enberg 2009-04-09 11:52:24 +03:00 committed by Ingo Molnar
parent b0096bb0b6
commit 598c73d250
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/irqinit_32.c
View File

@ -98,7 +98,7 @@ static void __init init_ISA_irqs(void)
{ {
int i; int i;
#ifdef CONFIG_X86_LOCAL_APIC #if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
init_bsp_APIC(); init_bsp_APIC();
#endif #endif
init_8259A(0); init_8259A(0);

10
arch/x86/kernel/irqinit_64.c
View File

@ -84,9 +84,14 @@ static void __init init_ISA_irqs(void)
{ {
int i; int i;
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
init_bsp_APIC(); init_bsp_APIC();
#endif
init_8259A(0); init_8259A(0);
/*
* 16 old-style INTA-cycle interrupts:
*/
for (i = 0; i < NR_IRQS_LEGACY; i++) { for (i = 0; i < NR_IRQS_LEGACY; i++) {
struct irq_desc *desc = irq_to_desc(i); struct irq_desc *desc = irq_to_desc(i);
@ -94,11 +99,8 @@ static void __init init_ISA_irqs(void)
desc->action = NULL; desc->action = NULL;
desc->depth = 1; desc->depth = 1;
/*
* 16 old-style INTA-cycle interrupts:
*/
set_irq_chip_and_handler_name(i, &i8259A_chip, set_irq_chip_and_handler_name(i, &i8259A_chip,
handle_level_irq, "XT"); handle_level_irq, "XT");
} }
} }