diff options
| author | smh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk> | 2004-12-31 18:35:40 +0000 |
|---|---|---|
| committer | smh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk> | 2004-12-31 18:35:40 +0000 |
| commit | de1f2c532c1da58e9e93485eac12c293cd86df47 (patch) | |
| tree | 0284aa4422cc145b5b57c0d423ec5604f7f6c672 | |
| parent | b7d997bf6bdd78974eae758d13e0460abd7c9cd7 (diff) | |
| parent | b0ef657c4d4e9c3744d066f80365e4e00f1d3f30 (diff) | |
| download | xen-de1f2c532c1da58e9e93485eac12c293cd86df47.tar.gz xen-de1f2c532c1da58e9e93485eac12c293cd86df47.tar.bz2 xen-de1f2c532c1da58e9e93485eac12c293cd86df47.zip | |
bitkeeper revision 1.1159.170.77 (41d59bfcre8NxFXZIV6T50LQhiAhYQ)
Merge tempest.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/testing/xen-2.0-testing.bk
| -rw-r--r-- | xen/arch/x86/pdb-stub.c | 1 | ||||
| -rw-r--r-- | xen/common/trace.c | 1 | ||||
| -rw-r--r-- | xen/include/asm-x86/x86_32/regs.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/xen/arch/x86/pdb-stub.c b/xen/arch/x86/pdb-stub.c index bb145aa104..827035e07f 100644 --- a/xen/arch/x86/pdb-stub.c +++ b/xen/arch/x86/pdb-stub.c @@ -21,6 +21,7 @@ #include <xen/list.h> #include <xen/serial.h> #include <xen/softirq.h> +#include <xen/init.h> /* opt_pdb: Name of serial port for Xen pervasive debugger (and enable pdb) */ static unsigned char opt_pdb[10] = "none"; diff --git a/xen/common/trace.c b/xen/common/trace.c index 06547c67d1..83bf5ce55e 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -25,6 +25,7 @@ #include <xen/smp.h> #include <xen/trace.h> #include <xen/errno.h> +#include <xen/init.h> #include <asm/atomic.h> #include <public/dom0_ops.h> diff --git a/xen/include/asm-x86/x86_32/regs.h b/xen/include/asm-x86/x86_32/regs.h index e03e2a8a4b..57d21e3cb6 100644 --- a/xen/include/asm-x86/x86_32/regs.h +++ b/xen/include/asm-x86/x86_32/regs.h @@ -1,6 +1,8 @@ #ifndef _I386_REGS_H #define _I386_REGS_H +#include <asm/types.h> + struct xen_regs { /* All saved activations contain the following fields. */ |