From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 Jun 2014 23:40:01 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.14.6~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9dfe2643fdcbd29c353f3f7760add6d62983d673;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	trace-module-maintain-a-valid-user-count.patch
---

diff --git a/queue-3.4/series b/queue-3.4/series
index c954f94cb8d..1e2e2796a0e 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -61,3 +61,4 @@ drm-nouveau-acpi-allow-non-optimus-setups-to-load-vbios-from-acpi.patch
 documentation-update-stable-address-in-chinese-and-japanese-translations.patch
 crypto-crypto_wq-fix-late-crypto-work-queue-initialization.patch
 media-media-device-fix-infoleak-in-ioctl-media_enum_entities.patch
+trace-module-maintain-a-valid-user-count.patch
diff --git a/queue-3.4/trace-module-maintain-a-valid-user-count.patch b/queue-3.4/trace-module-maintain-a-valid-user-count.patch
new file mode 100644
index 00000000000..6d629c8d0ed
--- /dev/null
+++ b/queue-3.4/trace-module-maintain-a-valid-user-count.patch
@@ -0,0 +1,44 @@
+From 098507ae3ec2331476fb52e85d4040c1cc6d0ef4 Mon Sep 17 00:00:00 2001
+From: Romain Izard <romain.izard.pro@gmail.com>
+Date: Tue, 4 Mar 2014 10:09:39 +0100
+Subject: trace: module: Maintain a valid user count
+
+From: Romain Izard <romain.izard.pro@gmail.com>
+
+commit 098507ae3ec2331476fb52e85d4040c1cc6d0ef4 upstream.
+
+The replacement of the 'count' variable by two variables 'incs' and
+'decs' to resolve some race conditions during module unloading was done
+in parallel with some cleanup in the trace subsystem, and was integrated
+as a merge.
+
+Unfortunately, the formula for this replacement was wrong in the tracing
+code, and the refcount in the traces was not usable as a result.
+
+Use 'count = incs - decs' to compute the user count.
+
+Link: http://lkml.kernel.org/p/1393924179-9147-1-git-send-email-romain.izard.pro@gmail.com
+
+Acked-by: Ingo Molnar <mingo@kernel.org>
+Cc: Rusty Russell <rusty@rustcorp.com.au>
+Cc: Frederic Weisbecker <fweisbec@gmail.com>
+Fixes: c1ab9cab7509 "merge conflict resolution"
+Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/trace/events/module.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/trace/events/module.h
++++ b/include/trace/events/module.h
+@@ -78,7 +78,7 @@ DECLARE_EVENT_CLASS(module_refcnt,
+ 
+ 	TP_fast_assign(
+ 		__entry->ip	= ip;
+-		__entry->refcnt	= __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs);
++		__entry->refcnt	= __this_cpu_read(mod->refptr->incs) - __this_cpu_read(mod->refptr->decs);
+ 		__assign_str(name, mod->name);
+ 	),
+