Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161657AbbEEMEh (ORCPT ); Tue, 5 May 2015 08:04:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51712 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758552AbbEEMEQ (ORCPT ); Tue, 5 May 2015 08:04:16 -0400 Date: Tue, 5 May 2015 05:03:58 -0700 From: tip-bot for Jan Kiszka Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, jan.kiszka@siemens.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, jan.kiszka@siemens.com In-Reply-To: <55479709.4030901@siemens.com> References: <55479709.4030901@siemens.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86: Let x2APIC support depend on interrupt remapping or guest support Git-Commit-ID: 19e3d60d49f05a9de0ef06c60703f31d4acd5f17 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1462 Lines: 38 Commit-ID: 19e3d60d49f05a9de0ef06c60703f31d4acd5f17 Gitweb: http://git.kernel.org/tip/19e3d60d49f05a9de0ef06c60703f31d4acd5f17 Author: Jan Kiszka AuthorDate: Mon, 4 May 2015 17:58:01 +0200 Committer: Thomas Gleixner 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 Link: http://lkml.kernel.org/r/55479709.4030901@siemens.com Signed-off-by: Thomas Gleixner --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/