diff options
| author | Roland McGrath <roland@redhat.com> | 2006-09-29 02:00:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:15 -0700 |
| commit | 0b4a8a789a328af6aac613734c362cf6aad72201 (patch) | |
| tree | e2488a7e4767dd1d25f4691b12fde86041404982 /kernel | |
| parent | 3171a0305d62e6627a24bff35af4f997e4988a80 (diff) | |
| download | linux-0b4a8a789a328af6aac613734c362cf6aad72201.tar.gz linux-0b4a8a789a328af6aac613734c362cf6aad72201.tar.bz2 linux-0b4a8a789a328af6aac613734c362cf6aad72201.zip | |
[PATCH] kexec warning fix
This fixes a couple of compiler warnings, and adds paranoia checks as well.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kexec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 37cad75cf494..fcdd5d2bc3f4 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -995,7 +995,8 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, image = xchg(dest_image, image); out: - xchg(&kexec_lock, 0); /* Release the mutex */ + locked = xchg(&kexec_lock, 0); /* Release the mutex */ + BUG_ON(!locked); kimage_free(image); return result; @@ -1061,7 +1062,8 @@ void crash_kexec(struct pt_regs *regs) machine_crash_shutdown(&fixed_regs); machine_kexec(kexec_crash_image); } - xchg(&kexec_lock, 0); + locked = xchg(&kexec_lock, 0); + BUG_ON(!locked); } } |