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

Commit 59ef48a5 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: smpboot - check if we have ESR register in wakeup_secondary_cpu 



We should check if we have ESR register before reading from it.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 33f8c40a

arch/x86/kernel/smpboot.c

+6 −4
Original line number Diff line number Diff line
@@ -599,10 +599,12 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) 
	 * Give the other CPU some time to accept the IPI.

	 */

	udelay(200);

	if (APIC_INTEGRATED(apic_version[phys_apicid])) {

		maxlvt = lapic_get_maxlvt();

		if (maxlvt > 3)			/* Due to the Pentium erratum 3AP.  */

			apic_write(APIC_ESR, 0);

		accept_status = (apic_read(APIC_ESR) & 0xEF);

	}

	pr_debug("NMI sent.\n");



	if (send_status)