diff options
author | Han, Weidong <weidong.han@intel.com> | 2009-04-03 17:15:50 +0800 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-04 10:42:28 +0100 |
commit | d0b03bd1c6725a3463290d7f9626e4b583518a5a (patch) | |
tree | ce4ef17315c5435a8a77cd8fdb47e17193093349 /arch/x86/Kconfig | |
parent | 34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf (diff) | |
download | linux-d0b03bd1c6725a3463290d7f9626e4b583518a5a.tar.gz linux-d0b03bd1c6725a3463290d7f9626e4b583518a5a.tar.bz2 linux-d0b03bd1c6725a3463290d7f9626e4b583518a5a.zip |
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/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3f27e5c0c9c9..229cf611d6ff 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -251,6 +251,7 @@ config SMP config X86_X2APIC bool "Support x2apic" depends on X86_LOCAL_APIC && X86_64 + select INTR_REMAP ---help--- This enables x2apic support on CPUs that have this feature. @@ -1879,7 +1880,6 @@ config DMAR_FLOPPY_WA config INTR_REMAP bool "Support for Interrupt Remapping (EXPERIMENTAL)" depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL - select X86_X2APIC ---help--- Supports Interrupt remapping for IO-APIC and MSI devices. To use x2apic mode in the CPU's which support x2APIC enhancements or |