aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2010-03-23 22:57:43 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-03-31 22:56:58 -0400
commitae832d1e03ac9bf09fb8a07fb37908ab40c7cd0e (patch)
treecf754c5242e66aa0349559af880db5fa29af6f2a /kernel
parent50354a8a28d0c91695a2d6d25b5a821bfe557a07 (diff)
tracing: Remove side effect from module tracepoints that caused a GPF
Remove the @refcnt argument, because it has side-effects, and arguments with side-effects are not skipped by the jump over disabled instrumentation and are executed even when the tracepoint is disabled. This was also causing a GPF as found by Randy Dunlap: Subject: 2.6.33 GP fault only when built with tracing LKML-Reference: <4BA2B69D.3000309@oracle.com> Note, the current 2.6.34-rc has a fix for the actual cause of the GPF, but this fixes one of its triggers. Tested-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> LKML-Reference: <4BA97FA7.6040406@cn.fujitsu.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c
index c968d3606dca..21591ad921f3 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -800,8 +800,7 @@ void module_put(struct module *module)
800 preempt_disable(); 800 preempt_disable();
801 __this_cpu_dec(module->refptr->count); 801 __this_cpu_dec(module->refptr->count);
802 802
803 trace_module_put(module, _RET_IP_, 803 trace_module_put(module, _RET_IP_);
804 __this_cpu_read(module->refptr->count));
805 /* Maybe they're waiting for us to drop reference? */ 804 /* Maybe they're waiting for us to drop reference? */
806 if (unlikely(!module_is_live(module))) 805 if (unlikely(!module_is_live(module)))
807 wake_up_process(module->waiter); 806 wake_up_process(module->waiter);