diff options
| author |   Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 20:45:53 +0400 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-08-19 02:07:14 +0200 |
| commit | 36c9d6742897fa414f51c4e9d0f20ab4e6bf942c (patch) | |
| tree | 4e671ed13edabe691f8f48a582141f3c086afd11 /arch/x86/kernel/apic_64.c | |
| parent | x86: apic - unify lapic_shutdown (diff) | |
| download | linux-dev-36c9d6742897fa414f51c4e9d0f20ab4e6bf942c.tar.xz linux-dev-36c9d6742897fa414f51c4e9d0f20ab4e6bf942c.zip | |
x86: apic - unify connect_bsp_APIC
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 48806546d49f..5579e213b5d2 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -1285,10 +1285,26 @@ asmlinkage void smp_error_interrupt(void) } /** - * * connect_bsp_APIC - attach the APIC to the interrupt system - * */ + * connect_bsp_APIC - attach the APIC to the interrupt system + */ void __init connect_bsp_APIC(void) { +#ifdef CONFIG_X86_32 + if (pic_mode) { + /* + * Do not trust the local APIC being empty at bootup. + */ + clear_local_APIC(); + /* + * PIC mode, enable APIC mode in the IMCR, i.e. connect BSP's + * local APIC to INT and NMI lines. + */ + apic_printk(APIC_VERBOSE, "leaving PIC mode, " + "enabling APIC mode.\n"); + outb(0x70, 0x22); + outb(0x01, 0x23); + } +#endif enable_apic_mode(); } |