diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /kernel/kexec.c | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index bf39d28e4c0e..58f0f382597c 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
| @@ -902,14 +902,14 @@ static int kimage_load_segment(struct kimage *image, | |||
| 902 | * kexec does not sync, or unmount filesystems so if you need | 902 | * kexec does not sync, or unmount filesystems so if you need |
| 903 | * that to happen you need to do that yourself. | 903 | * that to happen you need to do that yourself. |
| 904 | */ | 904 | */ |
| 905 | struct kimage *kexec_image = NULL; | 905 | struct kimage *kexec_image; |
| 906 | static struct kimage *kexec_crash_image = NULL; | 906 | struct kimage *kexec_crash_image; |
| 907 | /* | 907 | /* |
| 908 | * A home grown binary mutex. | 908 | * A home grown binary mutex. |
| 909 | * Nothing can wait so this mutex is safe to use | 909 | * Nothing can wait so this mutex is safe to use |
| 910 | * in interrupt context :) | 910 | * in interrupt context :) |
| 911 | */ | 911 | */ |
| 912 | static int kexec_lock = 0; | 912 | static int kexec_lock; |
| 913 | 913 | ||
| 914 | asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, | 914 | asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, |
| 915 | struct kexec_segment __user *segments, | 915 | struct kexec_segment __user *segments, |