[PATCH] x86/Kconfig: simplify X86_UP_APIC handling

["Jan Beulich" <JBeulich@suse.com>]

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 <jbeulich@suse.com>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
---
 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