diff options
author | Suresh Siddha <suresh.b.siddha@intel.com> | 2009-03-17 00:05:00 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-03-17 22:43:51 (GMT) |
commit | cf6567fe40c55e9cffca7355cd34e50fb2871e4e (patch) | |
tree | c05d4bdfa91a5c9ad35e9b6b1a06d9188ed7800f /arch/x86/include | |
parent | 7c6d9f9785d156d0438401ef270322da3d5247db (diff) | |
download | linux-cf6567fe40c55e9cffca7355cd34e50fb2871e4e.tar.xz |
x86, x2apic: fix clear_local_APIC() in the presence of x2apic
Impact: cleanup, paranoia
We were not clearing the local APIC in clear_local_APIC() in the
presence of x2apic. Fix it.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/apic.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/irq_remapping.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 394d177..6d5b6f0 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -184,6 +184,9 @@ static inline int x2apic_enabled(void) { return 0; } + +#define x2apic 0 + #endif extern int get_physical_broadcast(void); diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h index 20e1fd5..0396760 100644 --- a/arch/x86/include/asm/irq_remapping.h +++ b/arch/x86/include/asm/irq_remapping.h @@ -1,8 +1,6 @@ #ifndef _ASM_X86_IRQ_REMAPPING_H #define _ASM_X86_IRQ_REMAPPING_H -extern int x2apic; - #define IRTE_DEST(dest) ((x2apic) ? dest : dest << 8) #endif /* _ASM_X86_IRQ_REMAPPING_H */ |