projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Avoid recursion in lockdep when stack tracer takes locks
[powerpc.git]
/
kernel
/
kexec.c
diff --git
a/kernel/kexec.c
b/kernel/kexec.c
index
58f0f38
..
50087ec
100644
(file)
--- a/
kernel/kexec.c
+++ b/
kernel/kexec.c
@@
-1042,7
+1042,6
@@
asmlinkage long compat_sys_kexec_load(unsigned long entry,
void crash_kexec(struct pt_regs *regs)
{
void crash_kexec(struct pt_regs *regs)
{
- struct kimage *image;
int locked;
int locked;
@@
-1056,12
+1055,11
@@
void crash_kexec(struct pt_regs *regs)
*/
locked = xchg(&kexec_lock, 1);
if (!locked) {
*/
locked = xchg(&kexec_lock, 1);
if (!locked) {
- image = xchg(&kexec_crash_image, NULL);
- if (image) {
+ if (kexec_crash_image) {
struct pt_regs fixed_regs;
crash_setup_regs(&fixed_regs, regs);
machine_crash_shutdown(&fixed_regs);
struct pt_regs fixed_regs;
crash_setup_regs(&fixed_regs, regs);
machine_crash_shutdown(&fixed_regs);
- machine_kexec(image);
+ machine_kexec(
kexec_crash_
image);
}
xchg(&kexec_lock, 0);
}
}
xchg(&kexec_lock, 0);
}