aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/include/asm/unistd.h2
-rw-r--r--arch/x86/include/asm/unistd_64.h2
-rw-r--r--litmus/litmus.c2
-rw-r--r--litmus/sched_litmus.c8
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 @@
403#define __NR_sendmmsg (__NR_SYSCALL_BASE+374) 403#define __NR_sendmmsg (__NR_SYSCALL_BASE+374)
404#define __NR_setns (__NR_SYSCALL_BASE+375) 404#define __NR_setns (__NR_SYSCALL_BASE+375)
405 405
406#define __NR_LITMUS (__NR_SYSCALL_BASE+370) 406#define __NR_LITMUS (__NR_SYSCALL_BASE+376)
407#include <litmus/unistd_32.h> 407#include <litmus/unistd_32.h>
408 408
409/* 409/*
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)
682#define __NR_setns 308 682#define __NR_setns 308
683__SYSCALL(__NR_setns, sys_setns) 683__SYSCALL(__NR_setns, sys_setns)
684 684
685#define __NR_LITMUS 303 685#define __NR_LITMUS 309
686 686
687#include "litmus/unistd_64.h" 687#include "litmus/unistd_64.h"
688 688
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)
115 tp.cls != RT_CLASS_BEST_EFFORT) 115 tp.cls != RT_CLASS_BEST_EFFORT)
116 { 116 {
117 printk(KERN_INFO "litmus: real-time task %d rejected " 117 printk(KERN_INFO "litmus: real-time task %d rejected "
118 "because its class is invalid\n"); 118 "because its class is invalid\n", pid);
119 goto out_unlock; 119 goto out_unlock;
120 } 120 }
121 if (tp.budget_policy != NO_ENFORCEMENT && 121 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)
252 return; 252 return;
253} 253}
254 254
255static void switched_to_litmus(struct rq *rq, struct task_struct *p, int running) 255static void switched_to_litmus(struct rq *rq, struct task_struct *p)
256{ 256{
257} 257}
258 258
259static void prio_changed_litmus(struct rq *rq, struct task_struct *p, 259static void prio_changed_litmus(struct rq *rq, struct task_struct *p,
260 int oldprio, int running) 260 int oldprio)
261{ 261{
262} 262}
263 263
@@ -283,8 +283,8 @@ static void set_curr_task_litmus(struct rq *rq)
283 * We don't care about the scheduling domain; can gets called from 283 * We don't care about the scheduling domain; can gets called from
284 * exec, fork, wakeup. 284 * exec, fork, wakeup.
285 */ 285 */
286static int select_task_rq_litmus(struct rq *rq, struct task_struct *p, 286static int
287 int sd_flag, int flags) 287select_task_rq_litmus(struct task_struct *p, int sd_flag, int flags)
288{ 288{
289 /* preemption is already disabled. 289 /* preemption is already disabled.
290 * We don't want to change cpu here 290 * We don't want to change cpu here