tracing: Fix disabling of soft disable
authorTom Zanussi <tom.zanussi@linux.intel.com>
Sat, 29 Jun 2013 05:08:07 +0000 (00:08 -0500)
committerSteven Rostedt <rostedt@goodmis.org>
Tue, 2 Jul 2013 00:34:26 +0000 (20:34 -0400)
commit3baa5e4cf224b8a55220cc841bb475e164b84ceb
treea72b25de0dee2b538d94d8e08c1c9487a0cbd535
parent44a6a4ee1aed0eada8f21e6db81b4cd099788f82
tracing: Fix disabling of soft disable

The comment on the soft disable 'disable' case of
__ftrace_event_enable_disable() states that the soft disable bit
should be cleared in that case, but currently only the soft mode bit
is actually cleared.

This essentially leaves the standard non-soft-enable enable/disable
paths as the only way to clear the soft disable flag, but the soft
disable bit should also be cleared when removing a trigger with '!'.

Also, the SOFT_DISABLED bit should never be set if SOFT_MODE is
cleared.

This fixes the above discrepancies.

Link: http://lkml.kernel.org/r/b9c68dd50bc07019e6c67d3f9b29be4ef1b2badb.1372479499.git.tom.zanussi@linux.intel.com
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/trace_events.c