Commit 42fd2b50 authored Oct 29, 2016 by Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 bugfix from Thomas Gleixner:
 "A single bugfix for the recent changes related to registering the boot
  cpu when this has not happened before prefill_possible_map().

  The main problem with this change got fixed already, but we missed the
  case where the local APIC is not yet mapped, when prefill_possible_map()
  is invoked, so the registration of the boot cpu which has the APIC bit
  set in CPUID will explode.

  I should have seen that issue earlier, but all I can do now is feeling
  embarassed"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/smpboot: Init apic mapping before usage

parents efa56375 1e90a13d

arch/x86/kernel/setup.c

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1221,11 +1221,16 @@ void __init setup_arch(char **cmdline_p)
	*/		*/
	get_smp_config();		get_smp_config();

			/*
			* Systems w/o ACPI and mptables might not have it mapped the local
			* APIC yet, but prefill_possible_map() might need to access it.
			*/
			init_apic_mappings();

	prefill_possible_map();		prefill_possible_map();

	init_cpu_to_node();		init_cpu_to_node();

	init_apic_mappings();
	io_apic_init_mappings();		io_apic_init_mappings();

	kvm_guest_init();		kvm_guest_init();