Several minor changes and fixes to work with the current CoBaS code base.
[projects/modsched/linux.git] / include / linux / sched.h
index 4eb7cce..13e4681 100644 (file)
@@ -62,9 +62,6 @@ struct sched_param {
 
 #include <asm/processor.h>
 
-#ifdef CONFIG_MOD_SCHED
-#include <fw_task.h>
-#endif
 
 #define SCHED_ATTR_SIZE_VER0   48      /* sizeof first published struct */
 
@@ -1379,6 +1376,10 @@ struct tlbflush_unmap_batch {
        bool writable;
 };
 
+#ifdef CONFIG_MOD_SCHED
+typedef struct fw_task fw_task_t;
+#endif
+
 struct task_struct {
        volatile long state;    /* -1 unrunnable, 0 runnable, >0 stopped */
        void *stack;
@@ -1819,7 +1820,7 @@ struct task_struct {
 #endif
        int pagefault_disabled;
 #ifdef CONFIG_MOD_SCHED
-       struct fw_task fw_task;
+       struct fw_task *fw_task;
 #endif
 /* CPU-specific state of this task */
        struct thread_struct thread;