Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

Conflicts:
	arch/x86/kernel/io_apic.c
	kernel/rcuclassic.c
	kernel/sched.c
	kernel/time/tick-sched.c

Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 6 deletions

diff --git a/include/trace/sched.h b/include/trace/sched.h
index 9b2854abf7e2..0d81098ee9fc 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -17,12 +17,12 @@ DECLARE_TRACE(sched_wait_task,
                 TPARGS(rq, p));
 
 DECLARE_TRACE(sched_wakeup,
-        TPPROTO(struct rq *rq, struct task_struct *p),
-                TPARGS(rq, p));
+        TPPROTO(struct rq *rq, struct task_struct *p, int success),
+                TPARGS(rq, p, success));
 
 DECLARE_TRACE(sched_wakeup_new,
-        TPPROTO(struct rq *rq, struct task_struct *p),
-                TPARGS(rq, p));
+        TPPROTO(struct rq *rq, struct task_struct *p, int success),
+                TPARGS(rq, p, success));
 
 DECLARE_TRACE(sched_switch,
         TPPROTO(struct rq *rq, struct task_struct *prev,
@@ -30,8 +30,8 @@ DECLARE_TRACE(sched_switch,
                 TPARGS(rq, prev, next));
 
 DECLARE_TRACE(sched_migrate_task,
-        TPPROTO(struct rq *rq, struct task_struct *p, int dest_cpu),
-                TPARGS(rq, p, dest_cpu));
+        TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
+                TPARGS(p, orig_cpu, dest_cpu));
 
 DECLARE_TRACE(sched_process_free,
         TPPROTO(struct task_struct *p),