Litmus core: always np.preempt flag

Avoids getting tasks getting stuck in sched_yield() loops.

1 files changed, 5 insertions, 10 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 727357973328..a263bc68a7b5 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -161,12 +161,6 @@ static inline void request_exit_np(struct task_struct *t)
         }
 }
 
-static inline void clear_exit_np(struct task_struct *t)
-{
-        if (likely(tsk_rt(t)->ctrl_page))
-                tsk_rt(t)->ctrl_page->sched.np.preempt = 0;
-}
-
 static inline void make_np(struct task_struct *t)
 {
         tsk_rt(t)->kernel_np++;
@@ -226,10 +220,6 @@ static inline void request_exit_np(struct task_struct *t)
         BUG();
 }
 
-static inline void clear_exit_np(struct task_struct* t)
-{
-}
-
 static inline int request_exist_np_atomic(struct task_struct *t)
 {
         return 0;
@@ -237,6 +227,11 @@ static inline int request_exist_np_atomic(struct task_struct *t)
 
 #endif
 
+static inline void clear_exit_np(struct task_struct *t)
+{
+        if (likely(tsk_rt(t)->ctrl_page))
+                tsk_rt(t)->ctrl_page->sched.np.preempt = 0;
+}
 
 static inline int is_np(struct task_struct *t)
 {