lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: move x86_quirk_pre_intr_init() to irqinit_32.c

Browse Source 
Impact: cleanup

In preparation for unifying irqinit_{32,64}.c, make
x86_quirk_pre_intr_init() local to irqinit_32.c.

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:18 +03:00
committed by Ingo Molnar
parent e85abf8f43
commit f465145235
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/i8259.h
View File

@@ -60,8 +60,4 @@ extern struct irq_chip i8259A_chip;
extern void mask_8259A(void); extern void mask_8259A(void);
extern void unmask_8259A(void); extern void unmask_8259A(void);
#ifdef CONFIG_X86_32
extern void init_ISA_irqs(void);
#endif
#endif /* _ASM_X86_I8259_H */ #endif /* _ASM_X86_I8259_H */

1
arch/x86/include/asm/setup.h
View File

@@ -33,7 +33,6 @@ struct x86_quirks {
int (*setup_ioapic_ids)(void); int (*setup_ioapic_ids)(void);
}; };
extern void x86_quirk_pre_intr_init(void);
extern void x86_quirk_intr_init(void); extern void x86_quirk_intr_init(void);
extern void x86_quirk_trap_init(void); extern void x86_quirk_trap_init(void);

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

@@ -53,7 +53,7 @@ static struct irqaction fpu_irq = {
.name = "fpu", .name = "fpu",
}; };
void __init init_ISA_irqs(void) static void __init init_ISA_irqs(void)
{ {
int i; int i;
@@ -121,6 +121,24 @@ int vector_used_by_percpu_irq(unsigned int vector)
/* Overridden in paravirt.c */ /* Overridden in paravirt.c */
void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
/**
* x86_quirk_pre_intr_init - initialisation prior to setting up interrupt vectors
*
* Description:
* Perform any necessary interrupt initialisation prior to setting up
* the "ordinary" interrupt call gates. For legacy reasons, the ISA
* interrupts should be initialised here if the machine emulates a PC
* in any way.
**/
static void __init x86_quirk_pre_intr_init(void)
{
if (x86_quirks->arch_pre_intr_init) {
if (x86_quirks->arch_pre_intr_init())
return;
}
init_ISA_irqs();
}
void __init native_init_IRQ(void) void __init native_init_IRQ(void)
{ {
int i; int i;

18
arch/x86/kernel/setup.c
View File

@@ -996,24 +996,6 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
/**
* x86_quirk_pre_intr_init - initialisation prior to setting up interrupt vectors
*
* Description:
* Perform any necessary interrupt initialisation prior to setting up
* the "ordinary" interrupt call gates. For legacy reasons, the ISA
* interrupts should be initialised here if the machine emulates a PC
* in any way.
**/
void __init x86_quirk_pre_intr_init(void)
{
if (x86_quirks->arch_pre_intr_init) {
if (x86_quirks->arch_pre_intr_init())
return;
}
init_ISA_irqs();
}
/** /**
* x86_quirk_intr_init - post gate setup interrupt initialisation * x86_quirk_intr_init - post gate setup interrupt initialisation
* *