Messages in this thread | | | Date | Mon, 2 Nov 2015 13:22:45 -0500 | From | Steven Rostedt <> | Subject | Re: [PATCH] tracing: fix compiler warnings in trace_events.c |
| |
On Mon, 2 Nov 2015 00:00:43 -0800 Geliang Tang <geliangtang@163.com> wrote:
> Fix the following warnings: > kernel/trace/trace_events.c: In function '__ftrace_clear_event_pids': > kernel/trace/trace_events.c:579: warning: passing argument 1 of 'unregister_trace_sched_switch' from incompatible pointer type > include/trace/events/sched.h:162: note: expected 'void (*)(void *, bool, struct task_struct *, struct task_struct *)' but argument is of type 'void (*)(void *, struct task_struct *, struct task_struct *)' > kernel/trace/trace_events.c:580: warning: passing argument 1 of 'unregister_trace_sched_switch' from incompatible pointer type > include/trace/events/sched.h:162: note: expected 'void (*)(void *, bool, struct task_struct *, struct task_struct *)' but argument is of type 'void (*)(void *, struct task_struct *, struct task_struct *)' > kernel/trace/trace_events.c: In function 'ftrace_event_pid_write': > kernel/trace/trace_events.c:1724: warning: passing argument 1 of 'register_trace_prio_sched_switch' from incompatible pointer type > include/trace/events/sched.h:162: note: expected 'void (*)(void *, bool, struct task_struct *, struct task_struct *)' but argument is of type 'void (*)(void *, struct task_struct *, struct task_struct *)' > kernel/trace/trace_events.c:1726: warning: passing argument 1 of 'register_trace_prio_sched_switch' from incompatible pointer type > include/trace/events/sched.h:162: note: expected 'void (*)(void *, bool, struct task_struct *, struct task_struct *)' but argument is of type 'void (*)(void *, struct task_struct *, struct task_struct *)' > > Signed-off-by: Geliang Tang <geliangtang@163.com>
This is something that Linus is going to have to fix when he merges both trees. This patch wont work with either of them without the other already merged.
-- Steve
| |