lkml.org 
[lkml]   [2008]   [Nov]   [29]   [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-fixes-for-linus git tree from:

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

    Thanks,

    Ingo

    ------------------>
    Ingo Molnar (2):
    sched, cpusets: fix warning in kernel/cpuset.c
    sched: prevent divide by zero error in cpu_avg_load_per_task, update

    Steven Rostedt (1):
    sched: prevent divide by zero error in cpu_avg_load_per_task


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

    diff --git a/kernel/cpuset.c b/kernel/cpuset.c
    index da7ff61..96c0ba1 100644
    --- a/kernel/cpuset.c
    +++ b/kernel/cpuset.c
    @@ -585,7 +585,7 @@ static int generate_sched_domains(cpumask_t **domains,
    int i, j, k; /* indices for partition finding loops */
    cpumask_t *doms; /* resulting partition; i.e. sched domains */
    struct sched_domain_attr *dattr; /* attributes for custom domains */
    - int ndoms; /* number of sched domains in result */
    + int ndoms = 0; /* number of sched domains in result */
    int nslot; /* next empty doms[] cpumask_t slot */

    doms = NULL;
    diff --git a/kernel/sched.c b/kernel/sched.c
    index 9b1e793..b7480fb 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -1453,9 +1453,10 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
    static unsigned long cpu_avg_load_per_task(int cpu)
    {
    struct rq *rq = cpu_rq(cpu);
    + unsigned long nr_running = ACCESS_ONCE(rq->nr_running);

    - if (rq->nr_running)
    - rq->avg_load_per_task = rq->load.weight / rq->nr_running;
    + if (nr_running)
    + rq->avg_load_per_task = rq->load.weight / nr_running;
    else
    rq->avg_load_per_task = 0;


    \
     
     \ /
      Last update: 2008-11-29 20:57    [W:0.055 / U:0.840 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site