diff options
Diffstat (limited to 'xen/include')
-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 |
2 files changed, 4 insertions, 5 deletions
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> |