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

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
...@@ -611,7 +611,7 @@ static void stop_this_cpu (void * dummy) ...@@ -611,7 +611,7 @@ static void stop_this_cpu (void * dummy)
*/ */
cpu_clear(smp_processor_id(), cpu_online_map); cpu_clear(smp_processor_id(), cpu_online_map);
disable_local_APIC(); disable_local_APIC();
if (cpu_data(smp_processor_id()).hlt_works_ok) if (hlt_works(smp_processor_id()))
for(;;) halt(); for(;;) halt();
for (;;); for (;;);
} }
......
...@@ -416,8 +416,9 @@ static void stop_this_cpu(void *dummy) ...@@ -416,8 +416,9 @@ static void stop_this_cpu(void *dummy)
*/ */
cpu_clear(smp_processor_id(), cpu_online_map); cpu_clear(smp_processor_id(), cpu_online_map);
disable_local_APIC(); disable_local_APIC();
for (;;) if (hlt_works(smp_processor_id()))
halt(); for (;;) halt();
for (;;);
} }
void smp_send_stop(void) void smp_send_stop(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment