[Xen-changelog] [xen-unstable] [LINUX] Kexec: Don't try to load an NULL image. This can occur when unloading.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1168362868 0
# Node ID 79b5090c791fb9db9b5c4e7d3b5fe8b736da1533
# Parent  c98f3f3f7099ec1516354faa34a16be841e4a47c
[LINUX] Kexec: Don't try to load an NULL image. This can occur when unloading.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/kernel/kexec.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff -r c98f3f3f7099 -r 79b5090c791f linux-2.6-xen-sparse/kernel/kexec.c
--- a/linux-2.6-xen-sparse/kernel/kexec.c       Tue Jan 09 16:59:52 2007 +0000
+++ b/linux-2.6-xen-sparse/kernel/kexec.c       Tue Jan 09 17:14:28 2007 +0000
@@ -1012,9 +1012,11 @@ asmlinkage long sys_kexec_load(unsigned 
                        goto out;
        }
 #ifdef CONFIG_XEN
-       result = xen_machine_kexec_load(image);
-       if (result)
-               goto out;
+       if (image) {
+               result = xen_machine_kexec_load(image);
+               if (result)
+                       goto out;
+       }
 #endif
        /* Install the new kernel, and  Uninstall the old */
        image = xchg(dest_image, image);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog