ia64/xen-unstable

changeset 6062:7d84bc707736

Fix the x86/64 build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Aug 08 12:07:19 2005 +0000 (2005-08-08)
parents 61af128313c8
children 2360c4d7bb2f
files linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c xen/arch/x86/time.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c	Mon Aug 08 11:10:54 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c	Mon Aug 08 12:07:19 2005 +0000
     1.3 @@ -181,15 +181,15 @@ static inline u64 scale_delta(u64 delta,
     1.4  		delta <<= shift;
     1.5  
     1.6  	__asm__ (
     1.7 -		"pushl %%edx    ; "
     1.8 -		"mull  %3       ; "
     1.9 -		"popl  %%eax    ; "
    1.10 -		"pushl %%edx    ; "
    1.11 -		"mull  %3       ; "
    1.12 -		"popl  %3       ; "
    1.13 -		"addl  %3,%%eax ; "
    1.14 -		"xorl  %3,%3    ; "
    1.15 -		"adcl  %3,%%edx ; "
    1.16 +		"push %%edx    ; "
    1.17 +		"mul  %3       ; "
    1.18 +		"pop  %%eax    ; "
    1.19 +		"push %%edx    ; "
    1.20 +		"mul  %3       ; "
    1.21 +		"pop  %3       ; "
    1.22 +		"add  %3,%%eax ; "
    1.23 +		"xor  %3,%3    ; "
    1.24 +		"adc  %3,%%edx ; "
    1.25  		: "=A" (product), "=r" (tmp)
    1.26  		: "A" (delta), "1" (mul_frac) );
    1.27  
     2.1 --- a/xen/arch/x86/time.c	Mon Aug 08 11:10:54 2005 +0000
     2.2 +++ b/xen/arch/x86/time.c	Mon Aug 08 12:07:19 2005 +0000
     2.3 @@ -111,15 +111,15 @@ static inline u64 scale_delta(u64 delta,
     2.4          delta <<= scale->shift;
     2.5  
     2.6      __asm__ (
     2.7 -        "pushl %%edx    ; "
     2.8 -        "mull  %3       ; "
     2.9 -        "popl  %%eax    ; "
    2.10 -        "pushl %%edx    ; "
    2.11 -        "mull  %3       ; "
    2.12 -        "popl  %3       ; "
    2.13 -        "addl  %3,%%eax ; "
    2.14 -        "xorl  %3,%3    ; "
    2.15 -        "adcl  %3,%%edx ; "
    2.16 +        "push %%edx    ; "
    2.17 +        "mul  %3       ; "
    2.18 +        "pop  %%eax    ; "
    2.19 +        "push %%edx    ; "
    2.20 +        "mul  %3       ; "
    2.21 +        "pop  %3       ; "
    2.22 +        "add  %3,%%eax ; "
    2.23 +        "xor  %3,%3    ; "
    2.24 +        "adc  %3,%%edx ; "
    2.25          : "=A" (product), "=r" (tmp)
    2.26          : "A" (delta), "1" (scale->mul_frac) );
    2.27