Merge tag 'v4.3' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / include / linux / sched.h
index b7b9501..e067cff 100644 (file)
@@ -62,6 +62,10 @@ 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 */
 
 /*
@@ -1433,6 +1437,7 @@ struct task_struct {
        struct sched_info sched_info;
 #endif
 
+       struct list_head rq_tasks;
        struct list_head tasks;
 #ifdef CONFIG_SMP
        struct plist_node pushable_tasks;
@@ -1812,6 +1817,9 @@ struct task_struct {
        unsigned long   task_state_change;
 #endif
        int pagefault_disabled;
+#ifdef CONFIG_MOD_SCHED
+       struct fw_task fw_task;
+#endif
 /* CPU-specific state of this task */
        struct thread_struct thread;
 /*