Fix prototype mismatching and synch syscall numbers

* Update prototypes for switched_to(), prio_changed(), select_task_rq().
* Fix missing pid field in printk output.
* Synchronize syscall numbers for arm and x86.

4 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 110d113d4afb..0196edf6ee5b 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -403,7 +403,7 @@
 #define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
 #define __NR_setns                      (__NR_SYSCALL_BASE+375)
 
-#define __NR_LITMUS (__NR_SYSCALL_BASE+370)
+#define __NR_LITMUS (__NR_SYSCALL_BASE+376)
 #include <litmus/unistd_32.h>
 
 /*
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index f24806cf3a01..e347f0773788 100644
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@ -682,7 +682,7 @@ __SYSCALL(__NR_sendmmsg, sys_sendmmsg)
 #define __NR_setns                              308
 __SYSCALL(__NR_setns, sys_setns)
 
-#define __NR_LITMUS                             303
+#define __NR_LITMUS                             309
 
 #include "litmus/unistd_64.h"
 
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 26938acacafc..bb8c6c7e9dd1 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -115,7 +115,7 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
                 tp.cls != RT_CLASS_BEST_EFFORT)
         {
                 printk(KERN_INFO "litmus: real-time task %d rejected "
-                                 "because its class is invalid\n");
+                                 "because its class is invalid\n", pid);
                 goto out_unlock;
         }
         if (tp.budget_policy != NO_ENFORCEMENT &&
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index cb705e7f0466..5a15ce938984 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -252,12 +252,12 @@ static void task_tick_litmus(struct rq *rq, struct task_struct *p, int queued)
         return;
 }
 
-static void switched_to_litmus(struct rq *rq, struct task_struct *p, int running)
+static void switched_to_litmus(struct rq *rq, struct task_struct *p)
 {
 }
 
 static void prio_changed_litmus(struct rq *rq, struct task_struct *p,
-                                int oldprio, int running)
+                                int oldprio)
 {
 }
 
@@ -283,8 +283,8 @@ static void set_curr_task_litmus(struct rq *rq)
  * We don't care about the scheduling domain; can gets called from
  * exec, fork, wakeup.
  */
-static int select_task_rq_litmus(struct rq *rq, struct task_struct *p,
-                int sd_flag, int flags)
+static int
+select_task_rq_litmus(struct task_struct *p, int sd_flag, int flags)
 {
         /* preemption is already disabled.
          * We don't want to change cpu here