diff options
author | Jan Beulich <jbeulich@novell.com> | 2006-06-26 07:57:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:48:18 -0400 |
commit | 46d13a384bc695ec61458e5dcbac1eee6d623a9b (patch) | |
tree | 35e5ed5eb3a2c989b63b3f9863b2e201d332e996 /arch | |
parent | d2ae5b5f6afd3c4caaf82444102a4372135cb994 (diff) |
[PATCH] x86_64: use halt() instead of raw inline assembly
Use abstractions whenever possible.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/kernel/crash.c | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/smp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c index 4e6c3b729e39..ec1c7431d5af 100644 --- a/arch/x86_64/kernel/crash.c +++ b/arch/x86_64/kernel/crash.c | |||
@@ -111,7 +111,7 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu) | |||
111 | atomic_dec(&waiting_for_crash_ipi); | 111 | atomic_dec(&waiting_for_crash_ipi); |
112 | /* Assume hlt works */ | 112 | /* Assume hlt works */ |
113 | for(;;) | 113 | for(;;) |
114 | asm("hlt"); | 114 | halt(); |
115 | 115 | ||
116 | return 1; | 116 | return 1; |
117 | } | 117 | } |
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c index 4a6628b14d99..fe906ba1cf45 100644 --- a/arch/x86_64/kernel/smp.c +++ b/arch/x86_64/kernel/smp.c | |||
@@ -460,7 +460,7 @@ static void smp_really_stop_cpu(void *dummy) | |||
460 | { | 460 | { |
461 | smp_stop_cpu(); | 461 | smp_stop_cpu(); |
462 | for (;;) | 462 | for (;;) |
463 | asm("hlt"); | 463 | halt(); |
464 | } | 464 | } |
465 | 465 | ||
466 | void smp_send_stop(void) | 466 | void smp_send_stop(void) |