diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-05-12 15:20:51 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-23 14:58:28 -0400 |
commit | e309b41dd65aa953f86765eeeecc941d8e1e8b8f (patch) | |
tree | 295d4ed6e2a766607f889a04b977ca27cc24929e /kernel/trace/trace.h | |
parent | b53dde9d34f2df396540988ebc65c33400f57b04 (diff) |
ftrace: remove notrace
now that we have a kbuild method for notrace, no need to pollute the
C code with the annotations.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index faf9f67246ac..2b7352bf1ce6 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -150,7 +150,7 @@ struct trace_iterator { | |||
150 | long idx; | 150 | long idx; |
151 | }; | 151 | }; |
152 | 152 | ||
153 | void notrace tracing_reset(struct trace_array_cpu *data); | 153 | void tracing_reset(struct trace_array_cpu *data); |
154 | int tracing_open_generic(struct inode *inode, struct file *filp); | 154 | int tracing_open_generic(struct inode *inode, struct file *filp); |
155 | struct dentry *tracing_init_dentry(void); | 155 | struct dentry *tracing_init_dentry(void); |
156 | void ftrace(struct trace_array *tr, | 156 | void ftrace(struct trace_array *tr, |
@@ -189,10 +189,10 @@ void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu); | |||
189 | void update_max_tr_single(struct trace_array *tr, | 189 | void update_max_tr_single(struct trace_array *tr, |
190 | struct task_struct *tsk, int cpu); | 190 | struct task_struct *tsk, int cpu); |
191 | 191 | ||
192 | extern notrace cycle_t ftrace_now(int cpu); | 192 | extern cycle_t ftrace_now(int cpu); |
193 | 193 | ||
194 | #ifdef CONFIG_SCHED_TRACER | 194 | #ifdef CONFIG_SCHED_TRACER |
195 | extern void notrace | 195 | extern void |
196 | wakeup_sched_switch(struct task_struct *prev, struct task_struct *next); | 196 | wakeup_sched_switch(struct task_struct *prev, struct task_struct *next); |
197 | #else | 197 | #else |
198 | static inline void | 198 | static inline void |