ia64/xen-unstable

changeset 4337:8bd47d443295

bitkeeper revision 1.1236.43.18 (42449899XrfAZaA5DQMd2TyF9OVOoQ)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Fri Mar 25 23:02:49 2005 +0000 (2005-03-25)
parents 9c0a556b33b3 cdbbf0845b2c
children a18e1426d4c8
files xen/arch/x86/time.c
line diff
     1.1 --- a/xen/arch/x86/time.c	Fri Mar 25 22:58:05 2005 +0000
     1.2 +++ b/xen/arch/x86/time.c	Fri Mar 25 23:02:49 2005 +0000
     1.3 @@ -135,7 +135,7 @@ static unsigned long __init calibrate_ts
     1.4  
     1.5      diff = end - start;
     1.6  
     1.7 -#if defined(_i386__)
     1.8 +#if defined(__i386__)
     1.9      /* If quotient doesn't fit in 32 bits then we return error (zero). */
    1.10      if ( diff & ~0xffffffffULL )
    1.11          return 0;