]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: x86: remove WARN_ON from get_kernel_ns()
authorMarcelo Tosatti <mtosatti@redhat.com>
Thu, 10 Apr 2014 21:19:12 +0000 (18:19 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 May 2014 20:20:27 +0000 (13:20 -0700)
commit b351c39cc9e0151cee9b8d52a1e714928faabb38 upstream.

Function and callers can be preempted.

https://bugzilla.kernel.org/show_bug.cgi?id=73721

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/x86.c

index 2b8578432d5bccd296fa6d5859e3575c0fe4aa02..ee0c3b554a383df7c7b6b395238382cdf5557e47 100644 (file)
@@ -1109,7 +1109,6 @@ static inline u64 get_kernel_ns(void)
 {
        struct timespec ts;
 
-       WARN_ON(preemptible());
        ktime_get_ts(&ts);
        monotonic_to_bootbased(&ts);
        return timespec_to_ns(&ts);