Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30486
b: refs/heads/master
c: 46d13a3
h: refs/heads/master
v: v3
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Jun 26, 2006
1 parent cfe0d21 commit 265042e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2ae5b5f6afd3c4caaf82444102a4372135cb994
refs/heads/master: 46d13a384bc695ec61458e5dcbac1eee6d623a9b
2 changes: 1 addition & 1 deletion trunk/arch/x86_64/kernel/crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
atomic_dec(&waiting_for_crash_ipi);
/* Assume hlt works */
for(;;)
asm("hlt");
halt();

return 1;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86_64/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ static void smp_really_stop_cpu(void *dummy)
{
smp_stop_cpu();
for (;;)
asm("hlt");
halt();
}

void smp_send_stop(void)
Expand Down

0 comments on commit 265042e

Please sign in to comment.