summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2015-05-04 15:58:01 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2015-05-05 12:01:37 (GMT)
commit19e3d60d49f05a9de0ef06c60703f31d4acd5f17 (patch)
treedd47a1eba82969789f9892602caf8a390da787dd
parent781674fc33adf0d975a361e111bb45804356aa23 (diff)
downloadlinux-19e3d60d49f05a9de0ef06c60703f31d4acd5f17.tar.xz
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 <jan.kiszka@siemens.com> Link: http://lkml.kernel.org/r/55479709.4030901@siemens.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c86fdc1..3c17c04 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.