diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 11:41:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 11:41:41 -0700 |
| commit | 2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e (patch) | |
| tree | f14b3a1547a0f26789658f2939c904e180369482 /kernel/trace/trace_stack.c | |
| parent | b690a3770e99497982d48a93e30cb7de549aead8 (diff) | |
| parent | e1af3aec3e2e7d21d4b3054323779d478c19d907 (diff) | |
| download | op-kernel-dev-2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e.zip op-kernel-dev-2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e.tar.gz | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Fix trace_print_seq()
kprobes: No need to unlock kprobe_insn_mutex
tracing/fastboot: Document the need of initcall_debug
trace_export: Repair missed fields
tracing: Fix stack tracer sysctl handling
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 2d7aebd..e644af9 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -326,10 +326,10 @@ stack_trace_sysctl(struct ctl_table *table, int write, ret = proc_dointvec(table, write, file, buffer, lenp, ppos); if (ret || !write || - (last_stack_tracer_enabled == stack_tracer_enabled)) + (last_stack_tracer_enabled == !!stack_tracer_enabled)) goto out; - last_stack_tracer_enabled = stack_tracer_enabled; + last_stack_tracer_enabled = !!stack_tracer_enabled; if (stack_tracer_enabled) register_ftrace_function(&trace_ops); |
