From: Jan Kiszka Date: Mon, 4 May 2015 15:58:01 +0000 (+0200) Subject: x86: Let x2APIC support depend on interrupt remapping or guest support X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19e3d60d49f05a9de0ef06c60703f31d4acd5f17;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git x86: Let x2APIC support depend on interrupt remapping or guest support We are able to use x2APIC mode in the absence of interrupt remapping on certain hypervisors. So it is fine to disable IRQ_REMAP without having to give up x2APIC support. Signed-off-by: Jan Kiszka Link: http://lkml.kernel.org/r/55479709.4030901@siemens.com Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c86fdc13615f..3c17c04ce5a7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -340,7 +340,7 @@ config X86_FEATURE_NAMES config X86_X2APIC bool "Support x2apic" - depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP + depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST) ---help--- This enables x2apic support on CPUs that have this feature.