Fix spinlock bug

2 files changed, 4 insertions, 10 deletions

diff --git a/litmus/sched_gfl_split.c b/litmus/sched_gfl_split.c
index 983c98d088e9..70099ee3c64f 100644
--- a/litmus/sched_gfl_split.c
+++ b/litmus/sched_gfl_split.c
@@ -882,17 +882,13 @@ int gflsplit_fmlp_lock(struct litmus_lock* l)
         if (!is_realtime(t))
                 return -EPERM;
 
-        /* TODO: Check if it is safe to call cancel_split_timer here, i.e.
-         * that interrupts are disabled. */
+        spin_lock_irqsave(&sem->wait.lock, flags);
+
         tsk_rt(t)->in_crit_section = 1;
         if (entry->timer_armed) {
                 cancel_split_timer(entry);
         }
 
-        spin_lock_irqsave(&sem->wait.lock, flags);
-
-        tsk_rt(t)->in_crit_section = 1;
-
         if (sem->owner) {
                 /* resource is not free => must suspend and wait */
 
diff --git a/litmus/sched_gsn_edf_split.c b/litmus/sched_gsn_edf_split.c
index ba9f9f525600..74629de619bf 100644
--- a/litmus/sched_gsn_edf_split.c
+++ b/litmus/sched_gsn_edf_split.c
@@ -898,15 +898,13 @@ int gsnedfsplit_fmlp_lock(struct litmus_lock* l)
         if (!is_realtime(t))
                 return -EPERM;
 
-        /* TODO: Check if it is safe to call cancel_split_timer here, i.e.
-         * that interrupts are disabled. */
+        spin_lock_irqsave(&sem->wait.lock, flags);
+
         tsk_rt(t)->in_crit_section = 1;
         if (entry->timer_armed) {
                 cancel_split_timer(entry);
         }
 
-        spin_lock_irqsave(&sem->wait.lock, flags);
-
         if (sem->owner) {
                 /* resource is not free => must suspend and wait */