Litmus core: replace FMLP & SRP system calls with generic syscalls

This renders the FMLP and SRP unfunctional until they are ported to
the new locking API.

3 files changed, 18 insertions, 41 deletions

diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 27b719aebed9..8a3ed6d19a3c 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -105,23 +105,6 @@ int register_sched_plugin(struct sched_plugin* plugin);
 struct sched_plugin* find_sched_plugin(const char* name);
 int print_sched_plugins(char* buf, int max);
 
-static inline int srp_active(void)
-{
-#ifdef CONFIG_SRP
-        return litmus->srp_active;
-#else
-        return 0;
-#endif
-}
-static inline int fmlp_active(void)
-{
-#ifdef CONFIG_FMLP
-        return litmus->fmlp_active;
-#else
-        return 0;
-#endif
-}
-
 extern struct sched_plugin linux_sched_plugin;
 
 #endif
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index dbddc6523f8e..94264c27d9ac 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -10,14 +10,12 @@
 #define __NR_complete_job       __LSC(2)
 #define __NR_od_open            __LSC(3)
 #define __NR_od_close           __LSC(4)
-#define __NR_fmlp_down          __LSC(5)
-#define __NR_fmlp_up            __LSC(6)
-#define __NR_srp_down           __LSC(7)
-#define __NR_srp_up             __LSC(8)
-#define __NR_query_job_no       __LSC(9)
-#define __NR_wait_for_job_release __LSC(10)
-#define __NR_wait_for_ts_release __LSC(11)
-#define __NR_release_ts         __LSC(12)
-#define __NR_null_call          __LSC(13)
+#define __NR_litmus_lock        __LSC(5)
+#define __NR_litmus_unlock      __LSC(6)
+#define __NR_query_job_no       __LSC(7)
+#define __NR_wait_for_job_release __LSC(8)
+#define __NR_wait_for_ts_release __LSC(9)
+#define __NR_release_ts         __LSC(10)
+#define __NR_null_call          __LSC(11)
 
-#define NR_litmus_syscalls 14
+#define NR_litmus_syscalls 12
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index f0618e75348d..d5ced0d2642c 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -15,23 +15,19 @@ __SYSCALL(__NR_complete_job, sys_complete_job)
 __SYSCALL(__NR_od_open, sys_od_open)
 #define __NR_od_close                           __LSC(4)
 __SYSCALL(__NR_od_close, sys_od_close)
-#define __NR_fmlp_down                          __LSC(5)
-__SYSCALL(__NR_fmlp_down, sys_fmlp_down)
-#define __NR_fmlp_up                            __LSC(6)
-__SYSCALL(__NR_fmlp_up, sys_fmlp_up)
-#define __NR_srp_down                           __LSC(7)
-__SYSCALL(__NR_srp_down, sys_srp_down)
-#define __NR_srp_up                             __LSC(8)
-__SYSCALL(__NR_srp_up, sys_srp_up)
-#define __NR_query_job_no                       __LSC(9)
+#define __NR_litmus_lock                        __LSC(5)
+__SYSCALL(__NR_litmus_lock, sys_litmus_lock)
+#define __NR_litmus_unlock                      __LSC(6)
+__SYSCALL(__NR_litmus_unlock, sys_litmus_unlock)
+#define __NR_query_job_no                       __LSC(7)
 __SYSCALL(__NR_query_job_no, sys_query_job_no)
-#define __NR_wait_for_job_release               __LSC(10)
+#define __NR_wait_for_job_release               __LSC(8)
 __SYSCALL(__NR_wait_for_job_release, sys_wait_for_job_release)
-#define __NR_wait_for_ts_release                __LSC(11)
+#define __NR_wait_for_ts_release                __LSC(9)
 __SYSCALL(__NR_wait_for_ts_release, sys_wait_for_ts_release)
-#define __NR_release_ts                         __LSC(12)
+#define __NR_release_ts                         __LSC(10)
 __SYSCALL(__NR_release_ts, sys_release_ts)
-#define __NR_null_call                          __LSC(13)
+#define __NR_null_call                          __LSC(11)
 __SYSCALL(__NR_null_call, sys_null_call)
 
-#define NR_litmus_syscalls 14
+#define NR_litmus_syscalls 12