]> 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)
committerJiri Slaby <jslaby@suse.cz>
Thu, 29 May 2014 09:38:06 +0000 (11:38 +0200)
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: Jiri Slaby <jslaby@suse.cz>
arch/x86/kvm/x86.c

index 92af83d79c97a1dfa8bf1adf214b9204018d0306..77046f7177d531a425392e1905d700050adf980f 100644 (file)
@@ -1073,7 +1073,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);