Commit 69b88afa authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: clean up get_smp_config() 



Impact: cleanup

reorder exit path in __get_smp_config().

also move two print outs to acpi_process_madt

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent aa9c9b8c

arch/x86/kernel/acpi/boot.c

+11 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,17 @@ static void __init acpi_process_madt(void) 
			disable_acpi();

		}

	}



	/*

	 * ACPI supports both logical (e.g. Hyper-Threading) and physical

	 * processors, where MPS only supports physical.

	 */

	if (acpi_lapic && acpi_ioapic)

		printk(KERN_INFO "Using ACPI (MADT) for SMP configuration "

		       "information\n");

	else if (acpi_lapic)

		printk(KERN_INFO "Using ACPI for processor (LAPIC) "

		       "configuration information\n");

#endif

	return;

}

arch/x86/kernel/mpparse.c

+11 −14
Original line number Diff line number Diff line
@@ -586,26 +586,23 @@ static void __init __get_smp_config(unsigned int early) 
{

	struct intel_mp_floating *mpf = mpf_found;



	if (x86_quirks->mach_get_smp_config) {

		if (x86_quirks->mach_get_smp_config(early))

	if (!mpf)

		return;

	}



	if (acpi_lapic && early)

		return;



	/*

	 * ACPI supports both logical (e.g. Hyper-Threading) and physical

	 * processors, where MPS only supports physical.

	 * MPS doesn't support hyperthreading, aka only have

	 * thread 0 apic id in MPS table

	 */

	if (acpi_lapic && acpi_ioapic) {

		printk(KERN_INFO "Using ACPI (MADT) for SMP configuration "

		       "information\n");

	if (acpi_lapic && acpi_ioapic)

		return;

	} else if (acpi_lapic)

		printk(KERN_INFO "Using ACPI for processor (LAPIC) "

		       "configuration information\n");



	if (!mpf)

	if (x86_quirks->mach_get_smp_config) {

		if (x86_quirks->mach_get_smp_config(early))

			return;

	}



	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",

	       mpf->mpf_specification);