From 9fa169ba5fd0c8836dab08457af4f5c7a106fb9a Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Thu, 1 May 2008 12:45:42 -0400 Subject: LITMUS: reorganize system calls - this will make it easier to maintain it across multiple platforms and versions - also remove obsolete SRP system call --- arch/x86/kernel/syscall_table_32.S | 3 +-- include/asm-x86/unistd_32.h | 22 +++++----------------- include/litmus/unistd.h | 20 ++++++++++++++++++++ litmus/srp.c | 6 ------ 4 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 include/litmus/unistd.h diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index aee6fb9b79..f6fdb0a885 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S @@ -336,8 +336,7 @@ ENTRY(sys_call_table) .long sys_fmlp_up .long sys_srp_down .long sys_srp_up /* 335 */ - .long sys_reg_task_srp_sem .long sys_query_job_no .long sys_wait_for_job_release .long sys_wait_for_ts_release - .long sys_release_ts /* 340 */ + .long sys_release_ts /* 339 */ diff --git a/include/asm-x86/unistd_32.h b/include/asm-x86/unistd_32.h index d2bc5e56b0..36fec8409b 100644 --- a/include/asm-x86/unistd_32.h +++ b/include/asm-x86/unistd_32.h @@ -330,26 +330,14 @@ #define __NR_timerfd 322 #define __NR_eventfd 323 #define __NR_fallocate 324 -#define __NR_set_rt_task_param 325 -#define __NR_get_rt_task_param 326 -#define __NR_sleep_next_period 327 -#define __NR_register_np_flag 328 -#define __NR_exit_np 329 -#define __NR_od_open 330 -#define __NR_od_close 331 -#define __NR_fmlp_down 332 -#define __NR_fmlp_up 333 -#define __NR_srp_down 334 -#define __NR_srp_up 335 -#define __NR_reg_task_srp_sem 336 -#define __NR_query_job_no 337 -#define __NR_wait_for_job_release 338 -#define __NR_wait_for_ts_release 339 -#define __NR_release_ts 340 + +#define __NR_LITMUS 325 + +#include "litmus/unistd.h" #ifdef __KERNEL__ -#define NR_syscalls 340 +#define NR_syscalls 324 + NR_litmus_syscalls #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/include/litmus/unistd.h b/include/litmus/unistd.h new file mode 100644 index 0000000000..8224235d95 --- /dev/null +++ b/include/litmus/unistd.h @@ -0,0 +1,20 @@ + +#define __LSC(x) (__NR_LITMUS + x) + +#define __NR_set_rt_task_param __LSC(0) +#define __NR_get_rt_task_param __LSC(1) +#define __NR_sleep_next_period __LSC(2) +#define __NR_register_np_flag __LSC(3) +#define __NR_exit_np __LSC(4) +#define __NR_od_open __LSC(5) +#define __NR_od_close __LSC(6) +#define __NR_fmlp_down __LSC(7) +#define __NR_fmlp_up __LSC(8) +#define __NR_srp_down __LSC(9) +#define __NR_srp_up __LSC(10) +#define __NR_query_job_no __LSC(11) +#define __NR_wait_for_job_release __LSC(12) +#define __NR_wait_for_ts_release __LSC(13) +#define __NR_release_ts __LSC(14) + +#define NR_litmus_syscalls 15 diff --git a/litmus/srp.c b/litmus/srp.c index 3a1e7d8cc8..cbad091d48 100644 --- a/litmus/srp.c +++ b/litmus/srp.c @@ -236,12 +236,6 @@ asmlinkage long sys_srp_up(int sem_od) return ret; } -asmlinkage long sys_reg_task_srp_sem(int sem_od) -{ - /* unused */ - return 0; -} - static int srp_wake_up(wait_queue_t *wait, unsigned mode, int sync, void *key) { -- cgit v1.2.2