diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
| commit | 97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch) | |
| tree | 060c52298d42530f975064f7addc4e637fe00289 /include/xen/interface/xen.h | |
| parent | f22f9a89ce6857d377bf22dba4c1a8cd256c5136 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into tracing/ftracetip-tracing-ftrace-2008-06-25_10.27_Wed
Diffstat (limited to 'include/xen/interface/xen.h')
| -rw-r--r-- | include/xen/interface/xen.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 9b018da48cf3..819a0331cda9 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h @@ -10,6 +10,7 @@ #define __XEN_PUBLIC_XEN_H__ #include <asm/xen/interface.h> +#include <asm/pvclock-abi.h> /* * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS). @@ -336,7 +337,7 @@ struct vcpu_info { uint8_t evtchn_upcall_mask; unsigned long evtchn_pending_sel; struct arch_vcpu_info arch; - struct vcpu_time_info time; + struct pvclock_vcpu_time_info time; }; /* 64 bytes (x86) */ /* @@ -384,9 +385,7 @@ struct shared_info { * Wallclock time: updated only by control software. Guests should base * their gettimeofday() syscall on this wallclock-base value. */ - uint32_t wc_version; /* Version counter: see vcpu_time_info_t. */ - uint32_t wc_sec; /* Secs 00:00:00 UTC, Jan 1, 1970. */ - uint32_t wc_nsec; /* Nsecs 00:00:00 UTC, Jan 1, 1970. */ + struct pvclock_wall_clock wc; struct arch_shared_info arch; |