lkml.org 
[lkml]   [2011]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT PULL] scheduler fixes
    Linus,

    Please pull the latest sched-urgent-for-linus git tree from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-urgent-for-linus

    Thanks,

    Ingo

    ------------------>
    Shawn Bohrer (1):
    sched/rt: Migrate equal priority tasks to available CPUs

    Simon Kirby (1):
    sched: Fix up wchan borkage


    kernel/sched.c | 2 +-
    kernel/sched_rt.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/kernel/sched.c b/kernel/sched.c
    index ec5f472..d249ea8 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -4372,7 +4372,7 @@ static inline void sched_submit_work(struct task_struct *tsk)
    blk_schedule_flush_plug(tsk);
    }

    -asmlinkage void schedule(void)
    +asmlinkage void __sched schedule(void)
    {
    struct task_struct *tsk = current;

    diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
    index 97540f0..af11778 100644
    --- a/kernel/sched_rt.c
    +++ b/kernel/sched_rt.c
    @@ -1050,7 +1050,7 @@ select_task_rq_rt(struct task_struct *p, int sd_flag, int flags)
    */
    if (curr && unlikely(rt_task(curr)) &&
    (curr->rt.nr_cpus_allowed < 2 ||
    - curr->prio < p->prio) &&
    + curr->prio <= p->prio) &&
    (p->rt.nr_cpus_allowed > 1)) {
    int target = find_lowest_rq(p);

    @@ -1581,7 +1581,7 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p)
    p->rt.nr_cpus_allowed > 1 &&
    rt_task(rq->curr) &&
    (rq->curr->rt.nr_cpus_allowed < 2 ||
    - rq->curr->prio < p->prio))
    + rq->curr->prio <= p->prio))
    push_rt_tasks(rq);
    }


    \
     
     \ /
      Last update: 2011-09-30 20:41    [W:0.023 / U:3.516 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site