diff --git a/[refs] b/[refs] index 3f974726c167..6f91e40cc65c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e59c80c5bbc0d3d6b0772edb347ce2dd303121b3 +refs/heads/master: 19ccd97a03a026c2341b35af3ed2078a83c4a22b diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 2488f6f3ffad..91a227b436ee 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -148,7 +148,7 @@ static inline struct task_struct *task_of(struct sched_entity *se) /* * Enqueue an entity into the rb-tree: */ -static inline void +static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) { struct rb_node **link = &cfs_rq->tasks_timeline.rb_node; @@ -191,7 +191,7 @@ __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) schedstat_add(cfs_rq, wait_runtime, se->wait_runtime); } -static inline void +static void __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) { if (cfs_rq->rb_leftmost == &se->run_node)