ia64/xen-unstable

changeset 3371:f913da82d617

bitkeeper revision 1.1159.212.1 (41d59cb5edkDeCOlUSEcFsW0oqB4mw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Fri Dec 31 18:38:45 2004 +0000 (2004-12-31)
parents a9ac02b7727d 7b517e31b8e4
children 7cbc6c9823eb 2abc9e0c7f87
files xen/arch/x86/pdb-stub.c xen/common/trace.c xen/include/asm-x86/x86_32/regs.h
line diff
     1.1 --- a/xen/arch/x86/pdb-stub.c	Fri Dec 31 17:26:00 2004 +0000
     1.2 +++ b/xen/arch/x86/pdb-stub.c	Fri Dec 31 18:38:45 2004 +0000
     1.3 @@ -21,6 +21,7 @@
     1.4  #include <xen/list.h>
     1.5  #include <xen/serial.h>
     1.6  #include <xen/softirq.h>
     1.7 +#include <xen/init.h>
     1.8  
     1.9  /* opt_pdb: Name of serial port for Xen pervasive debugger (and enable pdb) */
    1.10  static unsigned char opt_pdb[10] = "none";
     2.1 --- a/xen/common/trace.c	Fri Dec 31 17:26:00 2004 +0000
     2.2 +++ b/xen/common/trace.c	Fri Dec 31 18:38:45 2004 +0000
     2.3 @@ -25,6 +25,7 @@
     2.4  #include <xen/smp.h>
     2.5  #include <xen/trace.h>
     2.6  #include <xen/errno.h>
     2.7 +#include <xen/init.h>
     2.8  #include <asm/atomic.h>
     2.9  #include <public/dom0_ops.h>
    2.10  
     3.1 --- a/xen/include/asm-x86/x86_32/regs.h	Fri Dec 31 17:26:00 2004 +0000
     3.2 +++ b/xen/include/asm-x86/x86_32/regs.h	Fri Dec 31 18:38:45 2004 +0000
     3.3 @@ -1,6 +1,8 @@
     3.4  #ifndef _I386_REGS_H
     3.5  #define _I386_REGS_H
     3.6  
     3.7 +#include <asm/types.h>
     3.8 +
     3.9  struct xen_regs
    3.10  {
    3.11      /* All saved activations contain the following fields. */