From 56c5c609615322bfbda5adff94ce011eb3d28fef Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Sat, 27 Aug 2011 16:10:06 +0200 Subject: 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. --- litmus/litmus.c | 2 +- litmus/sched_litmus.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'litmus') 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 -- cgit v1.2.2