From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Wed, 25 Jan 2006 18:09:28 +0000 (+0100)
Subject: Fix the 64-bit build.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16526^2~5^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=448a872b2f9befbe96e3cab1414ffe8b7e94555f;p=xen.git

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 4e1805dd5a..4f491a60e1 100644
--- 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 88fe273bab..5c39f574be 100644
--- 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 4cb1989d76..0d265badb8 100644
--- 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)