git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
crash.c
diff --git
a/arch/x86_64/kernel/crash.c
b/arch/x86_64/kernel/crash.c
index
4e6c3b7
..
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(;;)
atomic_dec(&waiting_for_crash_ipi);
/* Assume hlt works */
for(;;)
-
asm("hlt"
);
+
halt(
);
return 1;
}
static void smp_send_nmi_allbutself(void)
{
return 1;
}
static void smp_send_nmi_allbutself(void)
{
- send_IPI_allbutself(
APIC_DM_NMI
);
+ send_IPI_allbutself(
NMI_VECTOR
);
}
/*
}
/*
@@
-161,7
+161,7
@@
void machine_crash_shutdown(struct pt_regs *regs)
{
/*
* This function is only called after the system
{
/*
* This function is only called after the system
- * has paniced or is otherwise in a critical state.
+ * has panic
k
ed or is otherwise in a critical state.
* The minimum amount of code to allow a kexec'd kernel
* to run successfully needs to happen here.
*
* The minimum amount of code to allow a kexec'd kernel
* to run successfully needs to happen here.
*