summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich2006-06-26 13:57:59 +0200
committerLinus Torvalds2006-06-26 19:48:18 +0200
commit46d13a384bc695ec61458e5dcbac1eee6d623a9b (patch)
tree35e5ed5eb3a2c989b63b3f9863b2e201d332e996
parent[PATCH] x86_64: Get rid of pud_offset_k / __pud_offset_k (diff)
downloadkernel-qcow2-linux-46d13a384bc695ec61458e5dcbac1eee6d623a9b.tar.gz
kernel-qcow2-linux-46d13a384bc695ec61458e5dcbac1eee6d623a9b.tar.xz
kernel-qcow2-linux-46d13a384bc695ec61458e5dcbac1eee6d623a9b.zip
[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>
-rw-r--r--arch/x86_64/kernel/crash.c2
-rw-r--r--arch/x86_64/kernel/smp.c2
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)
atomic_dec(&waiting_for_crash_ipi);
/* Assume hlt works */
for(;;)
- asm("hlt");
+ halt();
return 1;
}
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)
{
smp_stop_cpu();
for (;;)
- asm("hlt");
+ halt();
}
void smp_send_stop(void)