diff options
| author | Avi Kivity <avi@qumranet.com> | 2008-07-14 19:53:33 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-07-14 19:53:33 +0300 |
| commit | 6b20e3e7352bf9cca29936a69758ed8763266d10 (patch) | |
| tree | b269a2db7b030154a0e940011c297c02415bad29 | |
| parent | 17254a0b1955afc86b8f225980f91408432b5fae (diff) | |
KVM: Avoid using ktime_t in an external header
It's an internal name, and further the representation is not portable.
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | include/linux/kvm.h | 2 | ||||
| -rw-r--r-- | virt/kvm/kvm_trace.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 5b64bb51277c..6edba45ca0aa 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -322,7 +322,7 @@ struct kvm_trace_rec { __u32 vcpu_id; union { struct { - ktime_t timestamp; + __u64 timestamp; __u32 extra_u32[KVM_TRC_EXTRA_MAX]; } timestamp; struct { diff --git a/virt/kvm/kvm_trace.c b/virt/kvm/kvm_trace.c index 8b34e490d325..41dcc845f78c 100644 --- a/virt/kvm/kvm_trace.c +++ b/virt/kvm/kvm_trace.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/relay.h> #include <linux/debugfs.h> +#include <linux/ktime.h> #include <linux/kvm_host.h> @@ -73,7 +74,7 @@ static void kvm_add_trace(void *probe_private, void *call_data, | TRACE_REC_NUM_DATA_ARGS(extra); if (p->timestamp_in) { - rec.u.timestamp.timestamp = ktime_get(); + rec.u.timestamp.timestamp = ktime_to_ns(ktime_get()); for (i = 0; i < extra; i++) rec.u.timestamp.extra_u32[i] = va_arg(*args, u32); |