Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Yinghai Lu <> | Subject | [PATCH] x86, x2apic: select IRQ_REMAP instead of depends on it | Date | Fri, 16 Dec 2011 16:48:54 -0800 |
| |
Nikunj A Dadhania found one X3850 x5, found lot of apic wierdness with 3.2-3c5.
It turns out make oldconfig will disable x2apic in new config, it will make x2apic pre-enabled system confused.
It is caused by | iommu: Rename the DMAR and INTR_REMAP config options
which renamed INTR_REMAP to IRQ_REMAP.
At very beginning, we do use select instead of depends, but | x86, intel-iommu: fix X2APIC && !ACPI build failure changed select to depends to solve !DMAR compiling error.
Now we have | iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n aka seperate INTR_REMAP and DMAR, and make them select DMAR_TABLE
So we could change back to select with out compiling with !DMAR. -v2: add depends on X86_IO_APIC, MSI, ACPI, to avoid X2APIC forcely select IRQ_REMAP while IRQ_REMAP depends on them. Pointed out by Ingo.
Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> --- arch/x86/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6/arch/x86/Kconfig =================================================================== --- linux-2.6.orig/arch/x86/Kconfig +++ linux-2.6/arch/x86/Kconfig @@ -286,7 +286,8 @@ config SMP config X86_X2APIC bool "Support x2apic" - depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP + depends on X86_LOCAL_APIC && X86_64 && X86_IO_APIC && PCI_MSI && ACPI + select IRQ_REMAP ---help--- This enables x2apic support on CPUs that have this feature.
| ![\](/images/icornerr.gif) |