aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-11-14 19:21:19 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-16 01:29:53 -0500
commitf3c7ac40a99f4044b843e6e2c4f46ab2d354c563 (patch)
treee4299e4cd9695adb6128eb3968d81a46f325b5c0 /kernel/trace/ftrace.c
parentc91add5fa68ea9b1f2923b3788c5dae0e60e1f6b (diff)
ftrace: remove condition from ftrace_record_ip
Impact: let module functions be recorded when dyn ftrace not enabled When dynamic ftrace had a daemon and a hash to record the locations of mcount callers at run time, the recording needed to stop when ftrace was disabled. But now that the recording is done at compile time and the ftrace_record_ip is only called at boot up and when a module is loaded, we no longer need to check if ftrace_enabled is set. In fact, this breaks module load if it is not set because we skip over module functions. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r--kernel/trace/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 54cb9a7d15e5..3160254f6c7e 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -334,7 +334,7 @@ ftrace_record_ip(unsigned long ip)
334{ 334{
335 struct dyn_ftrace *rec; 335 struct dyn_ftrace *rec;
336 336
337 if (!ftrace_enabled || ftrace_disabled) 337 if (ftrace_disabled)
338 return NULL; 338 return NULL;
339 339
340 rec = ftrace_alloc_dyn_node(ip); 340 rec = ftrace_alloc_dyn_node(ip);