diff options
Diffstat (limited to 'xen')
-rw-r--r-- | xen/common/dom0_ops.c | 2 | ||||
-rw-r--r-- | xen/common/domain.c | 2 | ||||
-rw-r--r-- | xen/common/kernel.c | 2 | ||||
-rw-r--r-- | xen/include/hypervisor-ifs/dom0_ops.h (renamed from xen/include/xeno/dom0_ops.h) | 7 | ||||
-rw-r--r-- | xen/include/xeno/sched.h | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index dd6111d700..e65eeb0df1 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -10,7 +10,7 @@ #include <xeno/types.h> #include <xeno/lib.h> #include <xeno/mm.h> -#include <xeno/dom0_ops.h> +#include <hypervisor-ifs/dom0_ops.h> #include <xeno/sched.h> #include <xeno/event.h> #include <asm/domain_page.h> diff --git a/xen/common/domain.c b/xen/common/domain.c index 19c26f986c..b9804c6ebc 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -9,7 +9,7 @@ #include <xeno/delay.h> #include <xeno/event.h> #include <xeno/time.h> -#include <xeno/dom0_ops.h> +#include <hypervisor-ifs/dom0_ops.h> #include <asm/io.h> #include <asm/domain_page.h> #include <asm/flushtlb.h> diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 5e1e2fc194..d403717e55 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -13,7 +13,7 @@ #include <asm/io.h> #include <asm/msr.h> #include <asm/uaccess.h> -#include <xeno/dom0_ops.h> +#include <hypervisor-ifs/dom0_ops.h> #include <asm/byteorder.h> #include <linux/if_ether.h> #include <asm/domain_page.h> diff --git a/xen/include/xeno/dom0_ops.h b/xen/include/hypervisor-ifs/dom0_ops.h index 93bb3e89c7..d8da108d66 100644 --- a/xen/include/xeno/dom0_ops.h +++ b/xen/include/hypervisor-ifs/dom0_ops.h @@ -3,9 +3,7 @@ * * Process command requests from domain-0 guest OS. * - * Copyright (c) 2002, K A Fraser, B Dragovic - * - * MUST BE KEPT IN SYNC WITH xenolinux<*>/arch/xeno/drivers/dom0/dom0_ops.h + * Copyright (c) 2002-2003, K A Fraser, B Dragovic */ @@ -88,7 +86,7 @@ typedef struct dom0_getdominfo_st long long cpu_time; } dom0_getdominfo_t; - +#ifndef NO_DOM0_OP_T typedef struct dom0_op_st { unsigned long cmd; @@ -104,5 +102,6 @@ typedef struct dom0_op_st } u; } dom0_op_t; +#endif #endif diff --git a/xen/include/xeno/sched.h b/xen/include/xeno/sched.h index f696b5ab56..7d9e2fcbd2 100644 --- a/xen/include/xeno/sched.h +++ b/xen/include/xeno/sched.h @@ -10,7 +10,7 @@ #include <asm/processor.h> #include <asm/current.h> #include <hypervisor-ifs/hypervisor-if.h> -#include <xeno/dom0_ops.h> +#include <hypervisor-ifs/dom0_ops.h> #include <xeno/list.h> #include <xeno/time.h> |