Merge branch 'core-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/kernel/kexec.c b/kernel/kexec.c
index bc933c0..f977786 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -159,6 +159,10 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments,
 
        kimage_terminate(image);
 
+       ret = machine_kexec_post_load(image);
+       if (ret)
+               goto out;
+
        /* Install the new kernel and uninstall the old */
        image = xchg(dest_image, image);