git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
kernel
/
trace
/
trace_sched_switch.c
diff --git
a/kernel/trace/trace_sched_switch.c
b/kernel/trace/trace_sched_switch.c
index
5fca0f5
..
a55fccf
100644
(file)
--- a/
kernel/trace/trace_sched_switch.c
+++ b/
kernel/trace/trace_sched_switch.c
@@
-50,8
+50,7
@@
tracing_sched_switch_trace(struct trace_array *tr,
}
static void
}
static void
-probe_sched_switch(struct rq *__rq, struct task_struct *prev,
- struct task_struct *next)
+probe_sched_switch(struct task_struct *prev, struct task_struct *next)
{
struct trace_array_cpu *data;
unsigned long flags;
{
struct trace_array_cpu *data;
unsigned long flags;
@@
-109,7
+108,7
@@
tracing_sched_wakeup_trace(struct trace_array *tr,
}
static void
}
static void
-probe_sched_wakeup(struct
rq *__rq, struct
task_struct *wakee, int success)
+probe_sched_wakeup(struct task_struct *wakee, int success)
{
struct trace_array_cpu *data;
unsigned long flags;
{
struct trace_array_cpu *data;
unsigned long flags;