3.14-stable patches

added patches:
	kvm-x86-remove-warn_on-from-get_kernel_ns.patch

diff --git a/queue-3.14/kvm-x86-remove-warn_on-from-get_kernel_ns.patch b/queue-3.14/kvm-x86-remove-warn_on-from-get_kernel_ns.patch
new file mode 100644 (file)
index 0000000..7ae0963
--- /dev/null
+++ b/queue-3.14/kvm-x86-remove-warn_on-from-get_kernel_ns.patch
@@ -0,0 +1,31 @@
+From b351c39cc9e0151cee9b8d52a1e714928faabb38 Mon Sep 17 00:00:00 2001
+From: Marcelo Tosatti <mtosatti@redhat.com>
+Date: Thu, 10 Apr 2014 18:19:12 -0300
+Subject: KVM: x86: remove WARN_ON from get_kernel_ns()
+
+From: Marcelo Tosatti <mtosatti@redhat.com>
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/x86.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -1109,7 +1109,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);

diff --git a/queue-3.14/series b/queue-3.14/series
index 3ec2493366e21530fd4711bdb318c4178afaf40d..e9009d9ba58c09f4d756138517f06692b4954d38 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -1,3 +1,4 @@
 scsi-fix-our-current-target-reap-infrastructure.patch
 scsi-dual-scan-thread-bug-fix.patch
 scsi-megaraid-missing-bounds-check-in-mimd_to_kioc.patch
+kvm-x86-remove-warn_on-from-get_kernel_ns.patch