Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bd062d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: prevent divide by zero error in cpu_avg_load_per_task, update
  sched, cpusets: fix warning in kernel/cpuset.c
  sched: prevent divide by zero error in cpu_avg_load_per_task
parents 72244c0e af6d596f

kernel/cpuset.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/sched.c

+3 −2
Original line number Diff line number Diff line
@@ -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;