* [PATCH] tracing: fix compiler warnings in trace_events.c
@ 2015-11-02 8:00 Geliang Tang
2015-11-02 18:22 ` Steven Rostedt
0 siblings, 1 reply; 2+ messages in thread
From: Geliang Tang @ 2015-11-02 8:00 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar; +Cc: Geliang Tang, linux-kernel
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>
---
kernel/trace/trace_events.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index fb0261e..0d86f0c 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -506,7 +506,7 @@ check_ignore_pid(struct trace_pid_list *filtered_pids, struct task_struct *task)
}
static void
-event_filter_pid_sched_switch_probe_pre(void *data,
+event_filter_pid_sched_switch_probe_pre(void *data, bool preempt,
struct task_struct *prev, struct task_struct *next)
{
struct trace_array *tr = data;
@@ -520,7 +520,7 @@ event_filter_pid_sched_switch_probe_pre(void *data,
}
static void
-event_filter_pid_sched_switch_probe_post(void *data,
+event_filter_pid_sched_switch_probe_post(void *data, bool preempt,
struct task_struct *prev, struct task_struct *next)
{
struct trace_array *tr = data;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tracing: fix compiler warnings in trace_events.c
2015-11-02 8:00 [PATCH] tracing: fix compiler warnings in trace_events.c Geliang Tang
@ 2015-11-02 18:22 ` Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2015-11-02 18:22 UTC (permalink / raw)
To: Geliang Tang; +Cc: Ingo Molnar, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-02 18:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-02 8:00 [PATCH] tracing: fix compiler warnings in trace_events.c Geliang Tang
2015-11-02 18:22 ` Steven Rostedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.