make klmirqd work like aux tasks. checkpoint.

this code is untested!

1 files changed, 39 insertions, 17 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index 22f46df4308a..7af1dd69a079 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -543,32 +543,54 @@ out:
 
 void suspend_for_lock(void)
 {
-#ifdef CONFIG_REALTIME_AUX_TASKS
-#if 0
-        unsigned int restore = 0;
+#if defined(CONFIG_REALTIME_AUX_TASKS) || defined(CONFIG_LITMUS_NVIDIA)
         struct task_struct *t = current;
-        unsigned int hide;
-
-        if (tsk_rt(t)->has_aux_tasks) {
-                /* hide from aux tasks so they can't inherit our priority when we block
-                 * for a litmus lock. inheritance is already going to a litmus lock
-                 * holder. */
-                hide = tsk_rt(t)->hide_from_aux_tasks;
-                restore = 1;
-                tsk_rt(t)->hide_from_aux_tasks = 1;
-        }
 #endif
+
+#ifdef CONFIG_REALTIME_AUX_TASKS
+        unsigned int aux_restore = 0;
+        unsigned int aux_hide;
+#endif
+
+#ifdef CONFIG_LITMUS_NVIDIA
+        unsigned int gpu_restore = 0;
+        unsigned int gpu_hide;
+#endif
+
+
+//#ifdef CONFIG_REALTIME_AUX_TASKS
+//      if (tsk_rt(t)->has_aux_tasks) {
+//              /* hide from aux tasks so they can't inherit our priority when we block
+//               * for a litmus lock. inheritance is already going to a litmus lock
+//               * holder. */
+//              aux_hide = tsk_rt(t)->hide_from_aux_tasks;
+//              aux_restore = 1;
+//              tsk_rt(t)->hide_from_aux_tasks = 1;
+//      }
+//#endif
+
+#ifdef CONFIG_LITMUS_NVIDIA
+        if (tsk_rt(t)->held_gpus) {
+                gpu_hide = tsk_rt(t)->hide_from_gpu;
+                gpu_restore = 1;
+                tsk_rt(t)->hide_from_gpu = 1;
+        }
 #endif
 
         schedule();
 
-#ifdef CONFIG_REALTIME_AUX_TASKS
-#if 0
-        if (restore) {
+#ifdef CONFIG_LITMUS_NVIDIA
+        if (gpu_restore) {
                 /* restore our state */
-                tsk_rt(t)->hide_from_aux_tasks = hide;
+                tsk_rt(t)->hide_from_gpu = gpu_hide;
         }
 #endif
+
+#ifdef CONFIG_REALTIME_AUX_TASKS
+        if (aux_restore) {
+                /* restore our state */
+                tsk_rt(t)->hide_from_aux_tasks = aux_hide;
+        }
 #endif
 }