projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
crash.c
diff --git
a/arch/x86_64/kernel/crash.c
b/arch/x86_64/kernel/crash.c
index
15beddc
..
d8d5750
100644
(file)
--- a/
arch/x86_64/kernel/crash.c
+++ b/
arch/x86_64/kernel/crash.c
@@
-111,14
+111,14
@@
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;
}
static void smp_send_nmi_allbutself(void)
{
- send_IPI_allbutself(
APIC_DM_NMI
);
+ send_IPI_allbutself(
NMI_VECTOR
);
}
/*