lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: fix __trace_special()

Browse Source 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar
2008-05-12 21:20:52 +02:00
committed by Thomas Gleixner
parent 017730c112
commit 1a3c303433
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/linux/sched.h
View File

@@ -2119,6 +2119,18 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm)
} }
#endif #endif
#ifdef CONFIG_TRACING
extern void
__trace_special(void *__tr, void *__data,
unsigned long arg1, unsigned long arg2, unsigned long arg3);
#else
static inline void
__trace_special(void *__tr, void *__data,
unsigned long arg1, unsigned long arg2, unsigned long arg3)
{
}
#endif
#ifdef CONFIG_CONTEXT_SWITCH_TRACER #ifdef CONFIG_CONTEXT_SWITCH_TRACER
extern void extern void
ftrace_ctx_switch(void *rq, struct task_struct *prev, struct task_struct *next); ftrace_ctx_switch(void *rq, struct task_struct *prev, struct task_struct *next);
@@ -2126,9 +2138,6 @@ extern void
ftrace_wake_up_task(void *rq, struct task_struct *wakee, ftrace_wake_up_task(void *rq, struct task_struct *wakee,
struct task_struct *curr); struct task_struct *curr);
extern void ftrace_all_fair_tasks(void *__rq, void *__tr, void *__data); extern void ftrace_all_fair_tasks(void *__rq, void *__tr, void *__data);
extern void
__trace_special(void *__tr, void *__data,
unsigned long arg1, unsigned long arg2, unsigned long arg3);
#else #else
static inline void static inline void
ftrace_ctx_switch(void *rq, struct task_struct *prev, struct task_struct *next) ftrace_ctx_switch(void *rq, struct task_struct *prev, struct task_struct *next)
@@ -2146,11 +2155,6 @@ ftrace_wake_up_task(void *rq, struct task_struct *wakee,
static inline void ftrace_all_fair_tasks(void *__rq, void *__tr, void *__data) static inline void ftrace_all_fair_tasks(void *__rq, void *__tr, void *__data)
{ {
} }
static inline void
__trace_special(void *__tr, void *__data,
unsigned long arg1, unsigned long arg2, unsigned long arg3)
{
}
#endif #endif
extern long sched_setaffinity(pid_t pid, const cpumask_t *new_mask); extern long sched_setaffinity(pid_t pid, const cpumask_t *new_mask);

4
kernel/trace/trace.c
View File

@@ -670,8 +670,6 @@ ftrace(struct trace_array *tr, struct trace_array_cpu *data,
trace_function(tr, data, ip, parent_ip, flags); trace_function(tr, data, ip, parent_ip, flags);
} }
#ifdef CONFIG_CONTEXT_SWITCH_TRACER
void void
__trace_special(void *__tr, void *__data, __trace_special(void *__tr, void *__data,
unsigned long arg1, unsigned long arg2, unsigned long arg3) unsigned long arg1, unsigned long arg2, unsigned long arg3)
@@ -693,8 +691,6 @@ __trace_special(void *__tr, void *__data,
trace_wake_up(); trace_wake_up();
} }
#endif
void __trace_stack(struct trace_array *tr, void __trace_stack(struct trace_array *tr,
struct trace_array_cpu *data, struct trace_array_cpu *data,
unsigned long flags, unsigned long flags,