1 files changed, 16 insertions, 16 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index e290aed53d4d..886bd14f677c 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
-#include <litmus/rsm_lock.h>
+#include <litmus/fifo_lock.h>
 #include <litmus/ikglp_lock.h>
 #endif
 
@@ -1457,27 +1457,27 @@ static void nested_decrease_priority_inheritance(struct task_struct* t,
 }
 
 
-/* ******************** RSM MUTEX ********************** */
+/* ******************** FIFO MUTEX ********************** */
 
-static struct litmus_lock_ops gsnedf_rsm_mutex_lock_ops = {
-        .lock   = rsm_mutex_lock,
-        .unlock = rsm_mutex_unlock,
-        .close  = rsm_mutex_close,
-        .deallocate = rsm_mutex_free,
+static struct litmus_lock_ops gsnedf_fifo_mutex_lock_ops = {
+        .lock   = fifo_mutex_lock,
+        .unlock = fifo_mutex_unlock,
+        .close  = fifo_mutex_close,
+        .deallocate = fifo_mutex_free,
 
-        .propagate_increase_inheritance = rsm_mutex_propagate_increase_inheritance,
-        .propagate_decrease_inheritance = rsm_mutex_propagate_decrease_inheritance,
+        .propagate_increase_inheritance = fifo_mutex_propagate_increase_inheritance,
+        .propagate_decrease_inheritance = fifo_mutex_propagate_decrease_inheritance,
 
 #ifdef CONFIG_LITMUS_DGL_SUPPORT
-        .dgl_lock = rsm_mutex_dgl_lock,
-        .is_owner = rsm_mutex_is_owner,
-        .enable_priority = rsm_mutex_enable_priority,
+        .dgl_lock = fifo_mutex_dgl_lock,
+        .is_owner = fifo_mutex_is_owner,
+        .enable_priority = fifo_mutex_enable_priority,
 #endif
 };
 
-static struct litmus_lock* gsnedf_new_rsm_mutex(void)
+static struct litmus_lock* gsnedf_new_fifo_mutex(void)
 {
-        return rsm_mutex_new(&gsnedf_rsm_mutex_lock_ops);
+        return fifo_mutex_new(&gsnedf_fifo_mutex_lock_ops);
 }
 
 /* ******************** IKGLP ********************** */
@@ -1739,8 +1739,8 @@ static long gsnedf_allocate_lock(struct litmus_lock **lock, int type,
                 *lock = gsnedf_new_fmlp();
                 break;
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
-    case RSM_MUTEX:
-                *lock = gsnedf_new_rsm_mutex();
+    case FIFO_MUTEX:
+                *lock = gsnedf_new_fifo_mutex();
                 break;
 
         case IKGLP_SEM: