aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorHan, Weidong <weidong.han@intel.com>2009-04-03 17:15:50 +0800
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-04-04 10:42:28 +0100
commitd0b03bd1c6725a3463290d7f9626e4b583518a5a (patch)
treece4ef17315c5435a8a77cd8fdb47e17193093349 /arch/x86/include/asm
parent34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf (diff)
x2apic/intr-remap: decouple interrupt remapping from x2apic
interrupt remapping must be enabled before enabling x2apic, but interrupt remapping doesn't depend on x2apic, it can be used separately. Enable interrupt remapping in init_dmars even x2apic is not supported. [dwmw2: Update Kconfig accordingly, fix build with INTR_REMAP && !X2APIC] Signed-off-by: Weidong Han <weidong.han@intel.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/apic.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index f9f0866ed6f..42f2f837742 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -107,11 +107,10 @@ extern u32 native_safe_apic_wait_icr_idle(void);
extern void native_apic_icr_write(u32 low, u32 id);
extern u64 native_apic_icr_read(void);
-#ifdef CONFIG_X86_X2APIC
-
#define EIM_8BIT_APIC_ID 0
#define EIM_32BIT_APIC_ID 1
+#ifdef CONFIG_X86_X2APIC
/*
* Make previous memory operations globally visible before
* sending the IPI through x2apic wrmsr. We need a serializing instruction or