From: Marcelo Tosatti <[email protected]>

[ Upstream commit b351c39cc9e0151cee9b8d52a1e714928faabb38 ]

Function and callers can be preempted.

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

Fixes: e984097b553ed2d6551c805223e4057421370f00
Cc: [email protected] # 3.14.x
Signed-off-by: Marcelo Tosatti <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
---
 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 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);
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to