summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-16 21:04:52 +0000
committerJohn Stultz <john.stultz@linaro.org>2014-07-23 15:01:45 -0700
commitbb0b58127c5add364cb597d58b1cf66eb279eae8 (patch)
tree5c4be236de033598f82f7cb1790976606f58529c
parent41fa4215f8e8150bdc5d2a5f8704915f1b059fa8 (diff)
downloadlinux-bb0b58127c5add364cb597d58b1cf66eb279eae8.tar.gz
linux-bb0b58127c5add364cb597d58b1cf66eb279eae8.tar.bz2
linux-bb0b58127c5add364cb597d58b1cf66eb279eae8.zip
x86: kvm: Use ktime_get_boot_ns()
Use the new nanoseconds based interface and get rid of the timespec conversion dance. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Gleb Natapov <gleb@kernel.org> Cc: kvm@vger.kernel.org Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--arch/x86/kvm/x86.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index f6449334ec45..65c430512132 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1109,11 +1109,7 @@ static void kvm_get_time_scale(uint32_t scaled_khz, uint32_t base_khz,
static inline u64 get_kernel_ns(void)
{
- struct timespec ts;
-
- ktime_get_ts(&ts);
- monotonic_to_bootbased(&ts);
- return timespec_to_ns(&ts);
+ return ktime_get_boot_ns();
}
#ifdef CONFIG_X86_64