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.

2 files changed, 6 insertions, 10 deletions

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 584a68349a41..b99087ac85b9 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -384,14 +384,12 @@
                 CALL(sys_complete_job)
                 CALL(sys_od_open)
                 CALL(sys_od_close)
-/* 375 */       CALL(sys_fmlp_down)
-                CALL(sys_fmlp_up)
-                CALL(sys_srp_down)
-                CALL(sys_srp_up)
+/* 375 */       CALL(sys_litmus_lock)
+                CALL(sys_litmus_unlock)
                 CALL(sys_query_job_no)
-/* 380 */       CALL(sys_wait_for_job_release)
+                CALL(sys_wait_for_job_release)
                 CALL(sys_wait_for_ts_release)
-                CALL(sys_release_ts)
+/* 380 */       CALL(sys_release_ts)
                 CALL(sys_null_call)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index d78c5ed5aef5..37702905f658 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -345,10 +345,8 @@ ENTRY(sys_call_table)
         .long sys_complete_job
         .long sys_od_open
         .long sys_od_close
-        .long sys_fmlp_down
-        .long sys_fmlp_up
-        .long sys_srp_down
-        .long sys_srp_up
+        .long sys_litmus_lock
+        .long sys_litmus_unlock
         .long sys_query_job_no
         .long sys_wait_for_job_release
         .long sys_wait_for_ts_release