resolve problems with conflicting function definitions in

sched.c

2 files changed, 9 insertions, 0 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index fc723e595c..57ee05252a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -57,6 +57,8 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 
+#include <linux/sched_plugin.h>
+
 /*
  * Protected counters by write_lock_irq(&tasklist_lock)
  */
@@ -118,6 +120,9 @@ void __put_task_struct(struct task_struct *tsk)
         WARN_ON(atomic_read(&tsk->usage));
         WARN_ON(tsk == current);
 
+        if (is_realtime(tsk))
+                curr_sched_plugin->tear_down(tsk);
+
         security_task_free(tsk);
         free_uid(tsk->user);
         put_group_info(tsk->group_info);
diff --git a/kernel/sched.c b/kernel/sched.c
index 7c171d2ccb..86bbf35fae 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -56,6 +56,10 @@
 
 #include <asm/unistd.h>
 
+#include <linux/litmus.h>
+#define __SCHED_C__
+#include <linux/sched_plugin.h>
+
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
  * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],