Fix warnings about preemptible code

2 files changed, 4 insertions, 2 deletions

diff --git a/litmus/sched_gfl_split.c b/litmus/sched_gfl_split.c
index 70099ee3c64f..cc4da73d32c7 100644
--- a/litmus/sched_gfl_split.c
+++ b/litmus/sched_gfl_split.c
@@ -875,7 +875,7 @@ int gflsplit_fmlp_lock(struct litmus_lock* l)
 {
         struct task_struct* t = current;
         struct fmlp_semaphore *sem = fmlp_from_lock(l);
-        cpu_entry_t* entry = &__get_cpu_var(gflsplit_cpu_entries);
+        cpu_entry_t* entry;
         wait_queue_t wait;
         unsigned long flags;
 
@@ -883,6 +883,7 @@ int gflsplit_fmlp_lock(struct litmus_lock* l)
                 return -EPERM;
 
         spin_lock_irqsave(&sem->wait.lock, flags);
+        entry = &__get_cpu_var(gflsplit_cpu_entries);
 
         tsk_rt(t)->in_crit_section = 1;
         if (entry->timer_armed) {
diff --git a/litmus/sched_gsn_edf_split.c b/litmus/sched_gsn_edf_split.c
index 74629de619bf..0757a6bce907 100644
--- a/litmus/sched_gsn_edf_split.c
+++ b/litmus/sched_gsn_edf_split.c
@@ -891,7 +891,7 @@ int gsnedfsplit_fmlp_lock(struct litmus_lock* l)
 {
         struct task_struct* t = current;
         struct fmlp_semaphore *sem = fmlp_from_lock(l);
-        cpu_entry_t* entry = &__get_cpu_var(gsnedfsplit_cpu_entries);
+        cpu_entry_t* entry;
         wait_queue_t wait;
         unsigned long flags;
 
@@ -899,6 +899,7 @@ int gsnedfsplit_fmlp_lock(struct litmus_lock* l)
                 return -EPERM;
 
         spin_lock_irqsave(&sem->wait.lock, flags);
+        entry = &__get_cpu_var(gsnedfsplit_cpu_entries);
 
         tsk_rt(t)->in_crit_section = 1;
         if (entry->timer_armed) {