summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2014-04-10 18:19:12 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2014-04-14 17:50:43 -0300
commitb351c39cc9e0151cee9b8d52a1e714928faabb38 (patch)
tree0a6f9ff4aee585dc1f332339b74cc0be7013c193 /arch
parent66386ade2aa7f5fcf0dda4171df7b4d4c274d2d6 (diff)
downloadlinux-stable-b351c39cc9e0151cee9b8d52a1e714928faabb38.tar.gz
linux-stable-b351c39cc9e0151cee9b8d52a1e714928faabb38.tar.bz2
linux-stable-b351c39cc9e0151cee9b8d52a1e714928faabb38.zip
KVM: x86: remove WARN_ON from get_kernel_ns()
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/x86.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 41693787cd66..757d40871b30 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1123,7 +1123,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);