Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02421f98 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC 



Impact: cleanup

didn't set it for UV_NON_UNIQUE_APIC, so don't restore it

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <49D6A6B9.6060501@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cdc1cb0d

arch/x86/kernel/smpboot.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -822,10 +822,12 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) 
	/* mark "stuck" area as not stuck */

	/* mark "stuck" area as not stuck */

	*((volatile unsigned long *)trampoline_base) = 0;

	*((volatile unsigned long *)trampoline_base) = 0;





	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {

		/*

		/*

		 * Cleanup possible dangling ends...

		 * Cleanup possible dangling ends...

		 */

		 */

		smpboot_restore_warm_reset_vector();

		smpboot_restore_warm_reset_vector();

	}





	return boot_error;

	return boot_error;

}

}