ia64/xen-unstable

changeset 4345:a18e1426d4c8

bitkeeper revision 1.1236.1.134 (4244ed85lTKc3QoN30qfyHLj2zIlfQ)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@firebug.cl.cam.ac.uk
date Fri Mar 25 23:05:08 2005 +0000 (2005-03-25)
parents 38c9523f3621 8bd47d443295
children 0dc36f964d78
files xen/arch/x86/time.c xen/common/domain.c
line diff
     1.1 --- a/xen/arch/x86/time.c	Fri Mar 25 22:52:21 2005 +0000
     1.2 +++ b/xen/arch/x86/time.c	Fri Mar 25 23:05:08 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;
     2.1 --- a/xen/common/domain.c	Fri Mar 25 22:52:21 2005 +0000
     2.2 +++ b/xen/common/domain.c	Fri Mar 25 23:05:08 2005 +0000
     2.3 @@ -14,6 +14,7 @@
     2.4  #include <xen/event.h>
     2.5  #include <xen/time.h>
     2.6  #include <xen/console.h>
     2.7 +#include <xen/softirq.h>
     2.8  #include <asm/shadow.h>
     2.9  #include <public/dom0_ops.h>
    2.10  #include <asm/domain_page.h>