Răsfoiți Sursa

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>
Thomas Gleixner 10 ani în urmă
părinte
comite
ba360f887a
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      arch/x86/Kconfig

+ 1 - 1
arch/x86/Kconfig

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