This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / kernel / kexec.c

diff --git a/kernel/kexec.c b/kernel/kexec.c
index e838875..b59023f 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -585,7 +585,6 @@ static int kimage_load_segment(struct kimage *image,
  * that to happen you need to do that yourself.
  */
 struct kimage *kexec_image = NULL;
-struct kimage *kexec_crash_image = NULL;
 
 asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
        struct kexec_segment *segments, unsigned long flags)
@@ -597,6 +596,13 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
        if (!capable(CAP_SYS_BOOT))
                return -EPERM;
 
+       /*
+        * In case we need just a little bit of special behavior for
+        * reboot on panic.
+        */
+       if (flags != 0)
+               return -EINVAL;
+
        if (nr_segments > KEXEC_SEGMENT_MAX)
                return -EINVAL;
 
@@ -626,10 +632,7 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
                }
        }
 
-       if (!flags)
-               image = xchg(&kexec_image, image);
-       else
-               image = xchg(&kexec_crash_image, image);
+       image = xchg(&kexec_image, image);
 
  out:
        kimage_free(image);