diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2014-04-10 18:19:12 -0300 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-29 11:38:06 +0200 |
commit | 146ca9148a6898ebc57576419dd375ac266f23b2 (patch) | |
tree | 4979b6c8dda054c8fc38de8d962c93674835ec25 /arch | |
parent | ef57e93eaa37b483191b5949b816d22ae441b45a (diff) |
KVM: x86: remove WARN_ON from get_kernel_ns()
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kvm/x86.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 92af83d79c9..77046f7177d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -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); |