Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757768AbbBEPb7 (ORCPT ); Thu, 5 Feb 2015 10:31:59 -0500 Received: from mail.emea.novell.com ([130.57.118.101]:58578 "EHLO mail.emea.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753480AbbBEPb6 convert rfc822-to-8bit (ORCPT ); Thu, 5 Feb 2015 10:31:58 -0500 Message-Id: <54D39AFC020000780005D684@mail.emea.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.0.1 Date: Thu, 05 Feb 2015 15:31:56 +0000 From: "Jan Beulich" To: , , Cc: , Subject: [PATCH] x86/Kconfig: simplify X86_UP_APIC handling Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1450 Lines: 42 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. Signed-off-by: Jan Beulich Cc: Bryan O'Donoghue --- arch/x86/Kconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- 3.19-rc7/arch/x86/Kconfig +++ 3.19-rc7-x86-Kconfig-UP-APIC-MSI/arch/x86/Kconfig @@ -856,7 +856,8 @@ config SCHED_MC source "kernel/Kconfig.preempt" 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 @@ -868,10 +869,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/