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

Commit 8ec59c0f authored by Vincent Guittot's avatar Vincent Guittot Committed by Ingo Molnar
Browse files

sched/topology: Remove unused 'sd' parameter from arch_scale_cpu_capacity() 



The 'struct sched_domain *sd' parameter to arch_scale_cpu_capacity() is
unused since commit:

  765d0af1 ("sched/topology: Remove the ::smt_gain field from 'struct sched_domain'")

Remove it.

Signed-off-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: gregkh@linuxfoundation.org
Cc: linux@armlinux.org.uk
Cc: quentin.perret@arm.com
Cc: rafael@kernel.org
Link: https://lkml.kernel.org/r/1560783617-5827-1-git-send-email-vincent.guittot@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d2abae71

arch/arm/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void update_cpu_capacity(unsigned int cpu) 
	topology_set_cpu_scale(cpu, cpu_capacity(cpu) / middle_capacity);



	pr_info("CPU%u: update cpu_capacity %lu\n",

		cpu, topology_get_cpu_scale(NULL, cpu));

		cpu, topology_get_cpu_scale(cpu));

}



#else

drivers/base/arch_topology.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static ssize_t cpu_capacity_show(struct device *dev, 
{

	struct cpu *cpu = container_of(dev, struct cpu, dev);



	return sprintf(buf, "%lu\n", topology_get_cpu_scale(NULL, cpu->dev.id));

	return sprintf(buf, "%lu\n", topology_get_cpu_scale(cpu->dev.id));

}



static void update_topology_flags_workfn(struct work_struct *work);
@@ -116,7 +116,7 @@ void topology_normalize_cpu_scale(void) 
			/ capacity_scale;

		topology_set_cpu_scale(cpu, capacity);

		pr_debug("cpu_capacity: CPU%d cpu_capacity=%lu\n",

			cpu, topology_get_cpu_scale(NULL, cpu));

			cpu, topology_get_cpu_scale(cpu));

	}

}
@@ -185,7 +185,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, 
	cpumask_andnot(cpus_to_visit, cpus_to_visit, policy->related_cpus);



	for_each_cpu(cpu, policy->related_cpus) {

		raw_capacity[cpu] = topology_get_cpu_scale(NULL, cpu) *

		raw_capacity[cpu] = topology_get_cpu_scale(cpu) *

				    policy->cpuinfo.max_freq / 1000UL;

		capacity_scale = max(raw_capacity[cpu], capacity_scale);

	}

include/linux/arch_topology.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ DECLARE_PER_CPU(unsigned long, cpu_scale); 


struct sched_domain;

static inline

unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu)

unsigned long topology_get_cpu_scale(int cpu)

{

	return per_cpu(cpu_scale, cpu);

}

include/linux/energy_model.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline unsigned long em_pd_energy(struct em_perf_domain *pd, 
	 * like schedutil.

	 */

	cpu = cpumask_first(to_cpumask(pd->cpus));

	scale_cpu = arch_scale_cpu_capacity(NULL, cpu);

	scale_cpu = arch_scale_cpu_capacity(cpu);

	cs = &pd->table[pd->nr_cap_states - 1];

	freq = map_util_freq(max_util, cs->frequency, scale_cpu);

include/linux/sched/topology.h

+3 −11
Original line number Diff line number Diff line
@@ -196,14 +196,6 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl); 
# define SD_INIT_NAME(type)

#endif



#ifndef arch_scale_cpu_capacity

static __always_inline

unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)

{

	return SCHED_CAPACITY_SCALE;

}

#endif



#else /* CONFIG_SMP */



struct sched_domain_attr;
@@ -219,16 +211,16 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) 
	return true;

}



#endif	/* !CONFIG_SMP */



#ifndef arch_scale_cpu_capacity

static __always_inline

unsigned long arch_scale_cpu_capacity(void __always_unused *sd, int cpu)

unsigned long arch_scale_cpu_capacity(int cpu)

{

	return SCHED_CAPACITY_SCALE;

}

#endif



#endif	/* !CONFIG_SMP */



static inline int task_node(const struct task_struct *p)

{

	return cpu_to_node(task_cpu(p));