aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorzhangwei(Jovi) <jovi.zhangwei@huawei.com>2013-04-09 23:26:30 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-07-02 20:42:32 -0400
commit8de1eb02778b64f8b292db531cf39a429f84315f (patch)
tree4e83db2c61e36e6a04d29435a57c694fe9452d0a /kernel
parent4480361c3c592fcbce3ef74e030719f0715e3a7e (diff)
tracing: Remove ftrace() function
The only caller of function ftrace(...) was removed a long time ago, so remove the function body as well. Link: http://lkml.kernel.org/r/1365564393-10972-10-git-send-email-jovi.zhangwei@huawei.com Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c9
-rw-r--r--kernel/trace/trace.h5
2 files changed, 0 insertions, 14 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 48aceb8a0328..f6fed9e51c64 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1637,15 +1637,6 @@ trace_function(struct trace_array *tr,
1637 __buffer_unlock_commit(buffer, event); 1637 __buffer_unlock_commit(buffer, event);
1638} 1638}
1639 1639
1640void
1641ftrace(struct trace_array *tr, struct trace_array_cpu *data,
1642 unsigned long ip, unsigned long parent_ip, unsigned long flags,
1643 int pc)
1644{
1645 if (likely(!atomic_read(&data->disabled)))
1646 trace_function(tr, ip, parent_ip, flags, pc);
1647}
1648
1649#ifdef CONFIG_STACKTRACE 1640#ifdef CONFIG_STACKTRACE
1650 1641
1651#define FTRACE_STACK_MAX_ENTRIES (PAGE_SIZE / sizeof(unsigned long)) 1642#define FTRACE_STACK_MAX_ENTRIES (PAGE_SIZE / sizeof(unsigned long))
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 1cbba04976b4..a4ed382dea2f 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -559,11 +559,6 @@ void tracing_iter_reset(struct trace_iterator *iter, int cpu);
559 559
560void poll_wait_pipe(struct trace_iterator *iter); 560void poll_wait_pipe(struct trace_iterator *iter);
561 561
562void ftrace(struct trace_array *tr,
563 struct trace_array_cpu *data,
564 unsigned long ip,
565 unsigned long parent_ip,
566 unsigned long flags, int pc);
567void tracing_sched_switch_trace(struct trace_array *tr, 562void tracing_sched_switch_trace(struct trace_array *tr,
568 struct task_struct *prev, 563 struct task_struct *prev,
569 struct task_struct *next, 564 struct task_struct *next,