commit ba360f887a4130b06c55eb93bcb4ae373b262a1c
author Thomas Gleixner <tglx@linutronix.de> Sat Jan 24 10:34:46 2015 +0100
committer Thomas Gleixner <tglx@linutronix.de> Sat Jan 24 10:34:46 2015 +0100
tree a4376fd1c910053f9544c05c3bcf3c6420161d40
parent 3f4cb7c064847569c9a6b7ab5c6cf0f67c80c55a

x86, init: Fix UP boot regression on x86_64

Commit 30b8b0066caf "init: Get rid of x86isms" broke the UP boot on
x86_64. That happens because CONFIG_UP_LATE_INIT depends on
CONFIG_X86_UP_APIC. X86_UP_APIC is a 32bit only config switch and
therefor not set on 64bit UP builds. As a consequence the UP init of
the local APIC and the IOAPIC is not called, which results in a boot
failure.

Make it depend on !SMP && X86_LOCAL_APIC instead.

Fixes: 30b8b0066caf init: Get rid of x86isms
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

arch/x86/Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ffcc3ca..04b8810 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -857,7 +857,7 @@
 
 config UP_LATE_INIT
        def_bool y
-       depends on X86_UP_APIC
+       depends on !SMP && X86_LOCAL_APIC
 
 config X86_UP_APIC
 	bool "Local APIC support on uniprocessors"