clean up ABI and headers

3 files changed, 32 insertions, 48 deletions

diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 6f5d227152..603550b615 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -319,30 +319,21 @@ ENTRY(sys_call_table)
         .long sys_move_pages
         .long sys_getcpu
         .long sys_epoll_pwait
-        /* LITMUS syscalls */
-        .long sys_ni_syscall /* sys_sched_setpolicy */  /* 320 */
-        .long sys_ni_syscall /* sys_sched_getpolicy */  
-        .long sys_ni_syscall /* sys_set_rt_mode */
-        .long sys_set_rt_task_param
+        /* LITMUS syscalls */ 
+        .long sys_set_rt_task_param     /* 320 */
         .long sys_get_rt_task_param
-        .long sys_ni_syscall            /* 325 */
+        .long sys_task_mode_transition 
         .long sys_sleep_next_period
-        .long sys_ni_syscall /* sys_scheduler_setup */
         .long sys_register_np_flag
-        .long sys_exit_np   
-        .long sys_od_open               /* 330 */
+        .long sys_exit_np               /* 325 */
+        .long sys_od_open
         .long sys_od_close
         .long sys_pi_down
         .long sys_pi_up                 
-        .long sys_srp_down              
-        .long sys_srp_up                /* 335 */
+        .long sys_srp_down              /* 330 */               
+        .long sys_srp_up
         .long sys_reg_task_srp_sem
         .long sys_query_job_no
-        .long sys_wait_for_job_release  
-        .long sys_ni_syscall /* sys_set_service_levels */
-        .long sys_ni_syscall /* sys_get_cur_service_level */ /* 340 */
-        .long sys_ni_syscall /* sys_reg_ics_cb */
-        .long sys_ni_syscall /* sys_start_wcs */
-        .long sys_task_mode_transition  /* 343 */
+        .long sys_wait_for_job_release  /* 334 */
 
 
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index ecc7490c2e..fa8d0537b5 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -326,30 +326,21 @@
 #define __NR_getcpu             318
 #define __NR_epoll_pwait        319
 /* LITMUS */
-#define __NR_sched_setpolicy    320
-#define __NR_sched_getpolicy    321
-/*      Syscall definitions for mode change and task creation-manipulation */
-#define __NR_set_rt_mode        322
-#define __NR_set_rt_task_param  323
-#define __NR_get_rt_task_param  324
-#define __NR_prepare_rt_task    325
-#define __NR_sleep_next_period  326
-#define __NR_scheduler_setup    327
-#define __NR_register_np_flag   328
-#define __NR_exit_np            329
-#define __NR_od_open            330
-#define __NR_od_close           331
-#define __NR_pi_down            332
-#define __NR_pi_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_set_service_levels 339
-#define __NR_get_cur_service_level 340
-#define __NR_reg_ics_cb         341
-#define __NR_start_wcs          342
+#define __NR_set_rt_task_param  320
+#define __NR_get_rt_task_param  321
+#define __NR_task_mode          322
+#define __NR_sleep_next_period  323
+#define __NR_register_np_flag   324
+#define __NR_exit_np            325
+#define __NR_od_open            336
+#define __NR_od_close           327
+#define __NR_pi_down            328
+#define __NR_pi_up              329
+#define __NR_srp_down           330
+#define __NR_srp_up             331
+#define __NR_reg_task_srp_sem   332
+#define __NR_query_job_no       333
+#define __NR_wait_for_job_release 334
 
 
 #ifdef __KERNEL__
diff --git a/include/linux/rt_param.h b/include/linux/rt_param.h
index 65d1fcd43f..8f34b3d530 100644
--- a/include/linux/rt_param.h
+++ b/include/linux/rt_param.h
@@ -5,8 +5,6 @@
 #ifndef _LINUX_RT_PARAM_H_
 #define _LINUX_RT_PARAM_H_
 
-#include <linux/wait.h>
-
 /* Litmus time type. */
 typedef unsigned long long lt_t;
 
@@ -30,12 +28,14 @@ typedef enum {
 } task_class_t;
 
 struct rt_task {
-        lt_t                    exec_cost;
-        lt_t                    period;
+        lt_t            exec_cost;
+        lt_t            period;
         unsigned int    cpu;
-        task_class_t    class;
+        task_class_t    cls;
 };
 
+#ifdef __KERNEL__
+
 struct rt_job {
         /* Time instant the the job was or will be released.  */
         lt_t    release;
@@ -112,7 +112,7 @@ struct rt_param {
          * section support.
          * Not inherited upon fork.
          */
-        __user short*           np_flag;
+        short*                  np_flag;
 
         /* For the FMLP under PSN-EDF, it is required to make the task
          * non-preemptive from kernel space. In order not to interfere with
@@ -160,7 +160,7 @@ struct rt_param {
 #define get_rt_period(t)        ((t)->rt_param.task_params.period)
 #define get_partition(t)        (t)->rt_param.task_params.cpu
 #define get_deadline(t)         ((t)->rt_param.job_params.deadline)
-#define get_class(t)            ((t)->rt_param.task_params.class)
+#define get_class(t)            ((t)->rt_param.task_params.cls)
 
 #define is_subject_to_srp(t)    ((t)->rt_param.subject_to_srp)
 #define is_hrt(t)               \
@@ -198,3 +198,5 @@ struct rt_param {
 #define take_np(t) do {t->rt_param.kernel_np--;} while(0);
 
 #endif
+
+#endif