sched/numa: Remove unused code from update_numa_stats() (d90707eb) · Commits · 戴 / test

With: commit ("sched/numa: Remove numa_has_capacity()") the local variables 'smt', 'cpus' and 'capacity' and their results are not used anymore in numa_has_capacity() Remove this unused code. Signed-off-by:

Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by:

Srikar Dronamraju <srikar@linux.vnet.ibm.com> Acked-by:

Mel Gorman <mgorman@techsingularity.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1535548752-4434-2-git-send-email-vincent.guittot@linaro.org Signed-off-by:

Ingo Molnar <mingo@kernel.org>

kernel/sched/fair.c

+1 −20

Original line number	Diff line number	Diff line
		@@ -1463,8 +1463,7 @@ struct numa_stats {
		*/
		static void update_numa_stats(struct numa_stats *ns, int nid)
		{
		int smt, cpu, cpus = 0;
		unsigned long capacity;
		int cpu;

		memset(ns, 0, sizeof(*ns));
		for_each_cpu(cpu, cpumask_of_node(nid)) {
		@@ -1473,26 +1472,8 @@ static void update_numa_stats(struct numa_stats *ns, int nid)
		ns->nr_running += rq->nr_running;
		ns->load += weighted_cpuload(rq);
		ns->compute_capacity += capacity_of(cpu);

		cpus++;
		}

		/*
		* If we raced with hotplug and there are no CPUs left in our mask
		* the @ns structure is NULL'ed and task_numa_compare() will
		* not find this node attractive.
		*
		* We'll detect a huge imbalance and bail there.
		*/
		if (!cpus)
		return;

		/* smt := ceil(cpus / capacity), assumes: 1 < smt_power < 2 */
		smt = DIV_ROUND_UP(SCHED_CAPACITY_SCALE * cpus, ns->compute_capacity);
		capacity = cpus / smt; /* cores */

		capacity = min_t(unsigned, capacity,
		DIV_ROUND_CLOSEST(ns->compute_capacity, SCHED_CAPACITY_SCALE));
		}

		struct task_numa_env {

Admin message