On Mon, 2 Nov 2015 00:00:43 -0800 Geliang Tang <[email protected]> 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 <[email protected]> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
