[Xen-changelog] [xen-unstable] merge

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1183455073 -3600
# Node ID 647f9671dc44cec803d0b9fab9e437d383a0f9b1
# Parent  b528cb182cc74fb002953466037ba56d6b9772aa
# Parent  296ffa18524abadd8432852ae51cda18f499de45
merge
---
 xen/arch/x86/x86_64/compat_kexec.S |    2 ++
 1 files changed, 2 insertions(+)

diff -r b528cb182cc7 -r 647f9671dc44 xen/arch/x86/x86_64/compat_kexec.S
--- a/xen/arch/x86/x86_64/compat_kexec.S        Tue Jul 03 10:29:55 2007 +0100
+++ b/xen/arch/x86/x86_64/compat_kexec.S        Tue Jul 03 10:31:13 2007 +0100
@@ -144,6 +144,8 @@ compatibility_mode:
         movl %cr0, %eax
         orl $X86_CR0_PG, %eax
         movl %eax, %cr0
+        jmp 1f
+1:
 
         popl %eax
         call *%eax

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