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

Commit 3be5b49e authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: make stop_this_cpu looks exactly equal in both arches 



with the hlt_works change, it is possible to have i386
and x86_64 stop_this_cpu() looking exactly the same. They
can, after that, be merged.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3d3f487c

arch/x86/kernel/smp_32.c

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static void stop_this_cpu (void * dummy) 
	 */

	cpu_clear(smp_processor_id(), cpu_online_map);

	disable_local_APIC();

	if (cpu_data(smp_processor_id()).hlt_works_ok)

	if (hlt_works(smp_processor_id()))

		for(;;) halt();

	for (;;);

}

arch/x86/kernel/smp_64.c

+3 −2
Original line number Diff line number Diff line
@@ -416,8 +416,9 @@ static void stop_this_cpu(void *dummy) 
	 */

	cpu_clear(smp_processor_id(), cpu_online_map);

	disable_local_APIC();

	for (;;)

		halt();

	if (hlt_works(smp_processor_id()))

		for (;;) halt();

	for (;;);

}



void smp_send_stop(void)