Skip to content

Commit

Permalink
x86, init: Fix UP boot regression on x86_64
Browse files Browse the repository at this point in the history
Commit 30b8b00 "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: 30b8b00 init: Get rid of x86isms
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Jan 24, 2015
1 parent 3f4cb7c commit ba360f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ source "kernel/Kconfig.preempt"

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"
Expand Down

0 comments on commit ba360f8

Please sign in to comment.