[Xen-changelog] Fix the 64-bit build.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c9362a31ba5d50bbdccc394a7d677bfe9c08fd2f
# Parent  407358daf3898067df46434cb0fd8e160370d9f4
Fix the 64-bit build.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 407358daf389 -r c9362a31ba5d xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       Wed Jan 25 16:41:22 2006
+++ b/xen/arch/x86/x86_32/entry.S       Wed Jan 25 18:09:28 2006
@@ -478,13 +478,13 @@
 .previous
 
 domain_crash_synchronous_string:
-       .asciz "domain_crash_sync from entry.S %lx\n"
-       
+        .asciz "domain_crash_sync called from entry.S (%lx)\n"
+
 domain_crash_synchronous:
-       pushl $domain_crash_synchronous_string
-       call printf
-       jmp __domain_crash_synchronous
-       
+        pushl $domain_crash_synchronous_string
+        call  printf
+        jmp   __domain_crash_synchronous
+
         ALIGN
 process_guest_exception_and_events:
         leal VCPU_trap_bounce(%ebx),%edx
diff -r 407358daf389 -r c9362a31ba5d xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S       Wed Jan 25 16:41:22 2006
+++ b/xen/arch/x86/x86_64/entry.S       Wed Jan 25 18:09:28 2006
@@ -436,6 +436,14 @@
         .quad FLT12,domain_crash_synchronous , FLT13,domain_crash_synchronous
 .previous
 
+domain_crash_synchronous_string:
+        .asciz "domain_crash_sync called from entry.S\n"
+
+domain_crash_synchronous:
+        leaq domain_crash_synchronous_string(%rip),%rdi
+        call printf
+        jmp  __domain_crash_synchronous
+
         ALIGN
 /* %rbx: struct vcpu */
 process_guest_exception_and_events:
diff -r 407358daf389 -r c9362a31ba5d xen/include/xen/sched.h
--- a/xen/include/xen/sched.h   Wed Jan 25 16:41:22 2006
+++ b/xen/include/xen/sched.h   Wed Jan 25 18:09:28 2006
@@ -240,7 +240,7 @@
  */
 extern void __domain_crash(struct domain *d);
 #define domain_crash(d) do {                                              \
-    printf("domain_crash called from %s:%d\n", __FILE__, __LINE__);       \
+    printk("domain_crash called from %s:%d\n", __FILE__, __LINE__);       \
     __domain_crash(d);                                                    \
 } while (0)
 
@@ -250,7 +250,7 @@
  */
 extern void __domain_crash_synchronous(void) __attribute__((noreturn));
 #define domain_crash_synchronous() do {                                   \
-    printf("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__);  \
+    printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__);  \
     __domain_crash_synchronous();                                         \
 } while (0)
 

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