[tip:x86/apic] x86: Let x2APIC support depend on interrupt remapping or guest support

[tip-bot for Jan Kiszka]

Commit-ID:  19e3d60d49f05a9de0ef06c60703f31d4acd5f17
Gitweb:     http://git.kernel.org/tip/19e3d60d49f05a9de0ef06c60703f31d4acd5f17
Author:     Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
AuthorDate: Mon, 4 May 2015 17:58:01 +0200
Committer:  Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Tue, 5 May 2015 14:01:37 +0200

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@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/55479709.4030901@xxxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/