[PATCH] trace: better use of stack_trace_enabled for boot up code

From: Steven Rostedt
Date: Wed Dec 17 2008 - 10:11:33 EST



The following patch is in:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git

branch: tip/devel


Steven Rostedt (1):
trace: better use of stack_trace_enabled for boot up code

----
kernel/trace/trace_stack.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---------------------------
commit 965ef53e1eb54de09aeec0af83d4635e9e9c9f73
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Dec 17 09:43:00 2008 -0500

trace: better use of stack_trace_enabled for boot up code

Impact: clean up

Andrew Morton suggested to use the stack_tracer_enabled variable
to decide whether or not to start stack tracing on bootup.
This lets us remove the start_stack_trace variable.

Reported-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>

diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 4842c96..d0871bc 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -308,7 +308,7 @@ stack_trace_sysctl(struct ctl_table *table, int write,

mutex_lock(&stack_sysctl_mutex);

- ret = proc_dointvec(table, write, file, buffer, lenp, ppos);
+ ret = proc_dointvec(table, write, file, buffer, lenp, ppos);

if (ret || !write ||
(last_stack_tracer_enabled == stack_tracer_enabled))
@@ -326,11 +326,10 @@ stack_trace_sysctl(struct ctl_table *table, int write,
return ret;
}

-static int start_stack_trace __initdata;
-
static __init int enable_stacktrace(char *str)
{
- start_stack_trace = 1;
+ stack_tracer_enabled = 1;
+ last_stack_tracer_enabled = 1;
return 1;
}
__setup("stacktrace", enable_stacktrace);
@@ -352,10 +351,8 @@ static __init int stack_trace_init(void)
if (!entry)
pr_warning("Could not create debugfs 'stack_trace' entry\n");

- if (start_stack_trace) {
+ if (stack_tracer_enabled)
register_ftrace_function(&trace_ops);
- stack_tracer_enabled = 1;
- }

return 0;
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/