diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/init_task.h | 5 | ||||
-rw-r--r-- | include/linux/sched.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 572c65bcc80f..ee65d87bedb7 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -133,9 +133,10 @@ extern struct group_info init_groups; | |||
133 | .nr_cpus_allowed = NR_CPUS, \ | 133 | .nr_cpus_allowed = NR_CPUS, \ |
134 | .mm = NULL, \ | 134 | .mm = NULL, \ |
135 | .active_mm = &init_mm, \ | 135 | .active_mm = &init_mm, \ |
136 | .run_list = LIST_HEAD_INIT(tsk.run_list), \ | 136 | .rt = { \ |
137 | .run_list = LIST_HEAD_INIT(tsk.rt.run_list), \ | ||
138 | .time_slice = HZ, }, \ | ||
137 | .ioprio = 0, \ | 139 | .ioprio = 0, \ |
138 | .time_slice = HZ, \ | ||
139 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ | 140 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ |
140 | .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ | 141 | .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ |
141 | .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ | 142 | .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 72e1b8ecfbe1..a06d09ebd5c6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -929,6 +929,11 @@ struct sched_entity { | |||
929 | #endif | 929 | #endif |
930 | }; | 930 | }; |
931 | 931 | ||
932 | struct sched_rt_entity { | ||
933 | struct list_head run_list; | ||
934 | unsigned int time_slice; | ||
935 | }; | ||
936 | |||
932 | struct task_struct { | 937 | struct task_struct { |
933 | volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ | 938 | volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ |
934 | void *stack; | 939 | void *stack; |
@@ -945,9 +950,9 @@ struct task_struct { | |||
945 | #endif | 950 | #endif |
946 | 951 | ||
947 | int prio, static_prio, normal_prio; | 952 | int prio, static_prio, normal_prio; |
948 | struct list_head run_list; | ||
949 | const struct sched_class *sched_class; | 953 | const struct sched_class *sched_class; |
950 | struct sched_entity se; | 954 | struct sched_entity se; |
955 | struct sched_rt_entity rt; | ||
951 | 956 | ||
952 | #ifdef CONFIG_PREEMPT_NOTIFIERS | 957 | #ifdef CONFIG_PREEMPT_NOTIFIERS |
953 | /* list of struct preempt_notifier: */ | 958 | /* list of struct preempt_notifier: */ |
@@ -972,7 +977,6 @@ struct task_struct { | |||
972 | unsigned int policy; | 977 | unsigned int policy; |
973 | cpumask_t cpus_allowed; | 978 | cpumask_t cpus_allowed; |
974 | int nr_cpus_allowed; | 979 | int nr_cpus_allowed; |
975 | unsigned int time_slice; | ||
976 | 980 | ||
977 | #ifdef CONFIG_PREEMPT_RCU | 981 | #ifdef CONFIG_PREEMPT_RCU |
978 | int rcu_read_lock_nesting; | 982 | int rcu_read_lock_nesting; |