diff --git a/[refs] b/[refs] index ea0da35248e7..83e08575c137 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07dd20e0324f4d3e33bde1944d4f7771a09c498c +refs/heads/master: bee367ed066e26c14263d808136fba8eec3bd70a diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 5a8058e44f58..08a87b5f29e1 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1010,8 +1010,8 @@ struct sched_entity { struct sched_rt_entity { struct list_head run_list; - unsigned int time_slice; unsigned long timeout; + unsigned int time_slice; int nr_cpus_allowed; struct sched_rt_entity *back;