[Xen-changelog] [xen-unstable] merge

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Node ID 01860d20feac41e3f1cf68edc8e41a0d8a3a9e62
# Parent  18b4b0fdf56b8c8915f26b87ea850bebe6f71669
# Parent  7ee6d20893f7b58fbad810a3fc87a250c61fd545
merge
---
 xen/common/kexec.c |    2 --
 1 files changed, 2 deletions(-)

diff -r 18b4b0fdf56b -r 01860d20feac xen/common/kexec.c
--- a/xen/common/kexec.c        Thu Nov 30 15:41:35 2006 +0000
+++ b/xen/common/kexec.c        Thu Nov 30 16:36:18 2006 +0000
@@ -119,8 +119,6 @@ void machine_crash_kexec(void)
         image = &kexec_image[KEXEC_IMAGE_CRASH_BASE + pos];
         machine_kexec(image); /* Does not return */
     }
-
-    while (1); /* No image available - just spin */
 }
 
 static void do_crashdump_trigger(unsigned char key)

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