ia64/xen-unstable

changeset 8663:c9362a31ba5d

Fix the 64-bit build.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Jan 25 19:09:28 2006 +0100 (2006-01-25)
parents 407358daf389
children ac04112c45b9
files xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_64/entry.S xen/include/xen/sched.h
line diff
     1.1 --- a/xen/arch/x86/x86_32/entry.S	Wed Jan 25 17:41:22 2006 +0100
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Wed Jan 25 19:09:28 2006 +0100
     1.3 @@ -478,13 +478,13 @@ nvm86_3:/* Rewrite our stack frame and r
     1.4  .previous
     1.5  
     1.6  domain_crash_synchronous_string:
     1.7 -	.asciz "domain_crash_sync from entry.S %lx\n"
     1.8 -	
     1.9 +        .asciz "domain_crash_sync called from entry.S (%lx)\n"
    1.10 +
    1.11  domain_crash_synchronous:
    1.12 -	pushl $domain_crash_synchronous_string
    1.13 -	call printf
    1.14 -	jmp __domain_crash_synchronous
    1.15 -	
    1.16 +        pushl $domain_crash_synchronous_string
    1.17 +        call  printf
    1.18 +        jmp   __domain_crash_synchronous
    1.19 +
    1.20          ALIGN
    1.21  process_guest_exception_and_events:
    1.22          leal VCPU_trap_bounce(%ebx),%edx
     2.1 --- a/xen/arch/x86/x86_64/entry.S	Wed Jan 25 17:41:22 2006 +0100
     2.2 +++ b/xen/arch/x86/x86_64/entry.S	Wed Jan 25 19:09:28 2006 +0100
     2.3 @@ -436,6 +436,14 @@ FLT13:  movq  %rax,(%rsi)               
     2.4          .quad FLT12,domain_crash_synchronous , FLT13,domain_crash_synchronous
     2.5  .previous
     2.6  
     2.7 +domain_crash_synchronous_string:
     2.8 +        .asciz "domain_crash_sync called from entry.S\n"
     2.9 +
    2.10 +domain_crash_synchronous:
    2.11 +        leaq domain_crash_synchronous_string(%rip),%rdi
    2.12 +        call printf
    2.13 +        jmp  __domain_crash_synchronous
    2.14 +
    2.15          ALIGN
    2.16  /* %rbx: struct vcpu */
    2.17  process_guest_exception_and_events:
     3.1 --- a/xen/include/xen/sched.h	Wed Jan 25 17:41:22 2006 +0100
     3.2 +++ b/xen/include/xen/sched.h	Wed Jan 25 19:09:28 2006 +0100
     3.3 @@ -240,7 +240,7 @@ extern void domain_pause_for_debugger(vo
     3.4   */
     3.5  extern void __domain_crash(struct domain *d);
     3.6  #define domain_crash(d) do {                                              \
     3.7 -    printf("domain_crash called from %s:%d\n", __FILE__, __LINE__);       \
     3.8 +    printk("domain_crash called from %s:%d\n", __FILE__, __LINE__);       \
     3.9      __domain_crash(d);                                                    \
    3.10  } while (0)
    3.11  
    3.12 @@ -250,7 +250,7 @@ extern void __domain_crash(struct domain
    3.13   */
    3.14  extern void __domain_crash_synchronous(void) __attribute__((noreturn));
    3.15  #define domain_crash_synchronous() do {                                   \
    3.16 -    printf("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__);  \
    3.17 +    printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__);  \
    3.18      __domain_crash_synchronous();                                         \
    3.19  } while (0)
    3.20