Fix the 64-bit build.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index 4e1805dd5a6608ea3c6f56c1a0304c0b3aa237be..4f491a60e15ed782ae3fa1aefee5544f0e63e514 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -478,13 +478,13 @@ nvm86_3:/* Rewrite our stack frame and return to ring 1. */
 .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 --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 88fe273babfc04f07fd02a1a53fe9c57457bc8d8..5c39f574be903bc688356c1f597fd0b3d7142b1b 100644 (file)
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -436,6 +436,14 @@ FLT13:  movq  %rax,(%rsi)               # RCX
         .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 --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 4cb1989d7672979dd673bc5dc8fb683dcc2701cc..0d265badb8a491f1c6e924295b3b5a27d2dc1af6 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -240,7 +240,7 @@ extern void domain_pause_for_debugger(void);
  */
 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(struct domain *d);
  */
 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)