diff options
author | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2006-01-03 10:20:05 -0600 |
---|---|---|
committer | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2006-01-03 10:20:05 -0600 |
commit | 9f336e8adf9fc86d8c978fa16012576f69f1ca2f (patch) | |
tree | d0953f66a7c6e573317099f612fb737e4af90497 | |
parent | e31c95409c7c96fad0abb5af6d931fdd4369275b (diff) | |
download | xen-9f336e8adf9fc86d8c978fa16012576f69f1ca2f.tar.gz xen-9f336e8adf9fc86d8c978fa16012576f69f1ca2f.tar.bz2 xen-9f336e8adf9fc86d8c978fa16012576f69f1ca2f.zip |
Adapt xen-ia64 to changes in xen-unstable
-rw-r--r-- | tools/libxc/xc_ia64_stubs.c | 1 | ||||
-rw-r--r-- | xen/arch/ia64/xen/domain.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/libxc/xc_ia64_stubs.c b/tools/libxc/xc_ia64_stubs.c index ab3a6c1222..c48f3a3044 100644 --- a/tools/libxc/xc_ia64_stubs.c +++ b/tools/libxc/xc_ia64_stubs.c @@ -627,6 +627,7 @@ int xc_vmx_build(int xc_handle, unsigned int control_evtchn, unsigned int lapic, unsigned int vcpus, + unsigned int acpi, unsigned int store_evtchn, unsigned long *store_mfn) { diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index d407458138..8c9dbada27 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -19,6 +19,7 @@ #include <xen/delay.h> #include <xen/softirq.h> #include <xen/mm.h> +#include <xen/iocap.h> #include <asm/ptrace.h> #include <asm/system.h> #include <asm/io.h> |