Move edf_set_hp_task() to litmus_sem.c as it needs to have knowledge of

what is stored in the wait queue's ->private field.

2 files changed, 23 insertions, 22 deletions

diff --git a/kernel/edf_common.c b/kernel/edf_common.c
index d221d54527..fa83450fe0 100644
--- a/kernel/edf_common.c
+++ b/kernel/edf_common.c
@@ -297,25 +297,3 @@ long edf_sleep_next_period(void)
         return 0;
 }
 
-
-/* caller is responsible for locking */
-int edf_set_hp_task(struct pi_semaphore *sem)
-{
-        struct list_head        *tmp, *next;
-        struct task_struct      *queued;
-        int ret = 0;
-
-        sem->hp_sem_task = NULL;
-        list_for_each_safe(tmp, next, &sem->wait.task_list) {
-                queued  = (struct task_struct*) 
-                        list_entry(tmp, wait_queue_t, 
-                                   task_list)->private;
-                
-                /* Compare task prios, find high prio task. */
-                if (edf_higher_prio(queued, sem->hp_sem_task)) {
-                        sem->hp_sem_task = queued;
-                        ret = 1;
-                }
-        }
-        return ret;
-}
diff --git a/kernel/litmus_sem.c b/kernel/litmus_sem.c
index c62b49bad2..fd26936475 100644
--- a/kernel/litmus_sem.c
+++ b/kernel/litmus_sem.c
@@ -280,6 +280,29 @@ static fastcall void rt_pi_down(struct pi_semaphore * sem)
 }
 
 
+/* caller is responsible for locking */
+int edf_set_hp_task(struct pi_semaphore *sem)
+{
+        struct list_head        *tmp, *next;
+        struct task_struct      *queued;
+        int ret = 0;
+
+        sem->hp_sem_task = NULL;
+        list_for_each_safe(tmp, next, &sem->wait.task_list) {
+                queued  = ((struct wq_pair*) 
+                        list_entry(tmp, wait_queue_t, 
+                                   task_list)->private)->tsk;
+                
+                /* Compare task prios, find high prio task. */
+                if (edf_higher_prio(queued, sem->hp_sem_task)) {
+                        sem->hp_sem_task = queued;
+                        ret = 1;
+                }
+        }
+        return ret;
+}
+
+
 /* Initialize PI semaphores at boot time. */
 static int __init pi_sema_boot_init(void)
 {