From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 24 Jan 2015 09:34:46 +0000 (+0100)
Subject: x86, init: Fix UP boot regression on x86_64
X-Git-Tag: fixes-v4.0-rc1~177^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba360f887a4130b06c55eb93bcb4ae373b262a1c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed