Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753322AbbBSA1a (ORCPT ); Wed, 18 Feb 2015 19:27:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47615 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbbBSA13 (ORCPT ); Wed, 18 Feb 2015 19:27:29 -0500 Date: Wed, 18 Feb 2015 16:27:08 -0800 From: tip-bot for Jan Beulich Message-ID: Cc: tglx@linutronix.de, jbeulich@suse.com, JBeulich@suse.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, pure.logic@nexus-software.ie Reply-To: pure.logic@nexus-software.ie, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, JBeulich@suse.com, tglx@linutronix.de, jbeulich@suse.com In-Reply-To: <54D39AFC020000780005D684@mail.emea.novell.com> References: <54D39AFC020000780005D684@mail.emea.novell.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/build] x86/Kconfig: Simplify X86_UP_APIC handling Git-Commit-ID: 50849eefea3ba8aa6e540e0cbdc9533098f25656 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: 1979 Lines: 53 Commit-ID: 50849eefea3ba8aa6e540e0cbdc9533098f25656 Gitweb: http://git.kernel.org/tip/50849eefea3ba8aa6e540e0cbdc9533098f25656 Author: Jan Beulich AuthorDate: Thu, 5 Feb 2015 15:31:56 +0000 Committer: Ingo Molnar CommitDate: Wed, 18 Feb 2015 22:10:54 +0100 x86/Kconfig: Simplify X86_UP_APIC handling We don't really need a helper symbol for that. For one, it's pointlessly getting set to Y for all configurations (even 64-bit ones). And then the purpose can be fulfilled by suitably adjusting X86_UP_APIC: Hide its prompt when PCI_MSI, and default it to PCI_MSI. Tested-by: Bryan O'Donoghue Signed-off-by: Jan Beulich Link: http://lkml.kernel.org/r/54D39AFC020000780005D684@mail.emea.novell.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index afb75f5..c226c2b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -859,7 +859,8 @@ config UP_LATE_INIT depends on !SMP && X86_LOCAL_APIC config X86_UP_APIC - bool "Local APIC support on uniprocessors" + bool "Local APIC support on uniprocessors" if !PCI_MSI + default PCI_MSI depends on X86_32 && !SMP && !X86_32_NON_STANDARD ---help--- A local APIC (Advanced Programmable Interrupt Controller) is an @@ -871,10 +872,6 @@ config X86_UP_APIC performance counters), and the NMI watchdog which detects hard lockups. -config X86_UP_APIC_MSI - def_bool y - select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI - config X86_UP_IOAPIC bool "IO-APIC support on uniprocessors" depends on X86_UP_APIC -- 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/