| From | Jiri Slaby <> | Subject | [PATCH 3.12 020/103] KVM: x86: remove WARN_ON from get_kernel_ns() | Date | Thu, 29 May 2014 15:48:05 +0200 |
| |
From: Marcelo Tosatti <mtosatti@redhat.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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 | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 92af83d79c97..77046f7177d5 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); -- 1.9.3
|