diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
| commit | f6c43385435640e056424034caac0d765c45e370 (patch) | |
| tree | 54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /kernel/trace/trace_stack.c | |
| parent | 65bc98b0059360e458aebd208587be44641227c1 (diff) | |
| parent | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 2d7aebd71dbd..e644af910124 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, | |||
| 326 | ret = proc_dointvec(table, write, file, buffer, lenp, ppos); | 326 | ret = proc_dointvec(table, write, file, buffer, lenp, ppos); |
| 327 | 327 | ||
| 328 | if (ret || !write || | 328 | if (ret || !write || |
| 329 | (last_stack_tracer_enabled == stack_tracer_enabled)) | 329 | (last_stack_tracer_enabled == !!stack_tracer_enabled)) |
| 330 | goto out; | 330 | goto out; |
| 331 | 331 | ||
| 332 | last_stack_tracer_enabled = stack_tracer_enabled; | 332 | last_stack_tracer_enabled = !!stack_tracer_enabled; |
| 333 | 333 | ||
| 334 | if (stack_tracer_enabled) | 334 | if (stack_tracer_enabled) |
| 335 | register_ftrace_function(&trace_ops); | 335 | register_ftrace_function(&trace_ops); |