diff --git a/[refs] b/[refs]
index 06ac1de5777b..3d9faacb19b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ae5b5f6afd3c4caaf82444102a4372135cb994
+refs/heads/master: 46d13a384bc695ec61458e5dcbac1eee6d623a9b
diff --git a/trunk/arch/x86_64/kernel/crash.c b/trunk/arch/x86_64/kernel/crash.c
index 4e6c3b729e39..ec1c7431d5af 100644
--- a/trunk/arch/x86_64/kernel/crash.c
+++ b/trunk/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/trunk/arch/x86_64/kernel/smp.c b/trunk/arch/x86_64/kernel/smp.c
index 4a6628b14d99..fe906ba1cf45 100644
--- a/trunk/arch/x86_64/kernel/smp.c
+++ b/trunk/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)