diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2009-02-21 14:23:21 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 18:20:50 +0100 |
| commit | ef1f87aa7ba6224bef1b750b3272ba281d8f43ed (patch) | |
| tree | aa20b7b3c6ff0eefccb17c02589f02c624bba8df /arch/x86/include/asm/apic.h | |
| parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
| download | linux-next-ef1f87aa7ba6224bef1b750b3272ba281d8f43ed.tar.gz | |
x86: select x2apic ops in early apic probe only if x2apic mode is enabled
If BIOS hands over the control to OS in legacy xapic mode, select
legacy xapic related ops in the early apic probe and shift to x2apic
ops later in the boot sequence, only after enabling x2apic mode.
If BIOS hands over the control in x2apic mode, select x2apic related
ops in the early apic probe.
This fixes the early boot panic, where we were selecting x2apic ops,
while the cpu is still in legacy xapic mode.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index dce1bf696cca..a6208dc74633 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -146,7 +146,7 @@ static inline u64 native_x2apic_icr_read(void) return val; } -extern int x2apic; +extern int x2apic, x2apic_phys; extern void check_x2apic(void); extern void enable_x2apic(void); extern void enable_IR_x2apic(void); |