| Message ID | 20170706094948.8779-5-dietmar.eggemann@arm.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On 06-07-17, 10:49, Dietmar Eggemann wrote: > Define arch_set_freq_scale to be the arch_topology "driver" function > topology_set_freq_scale() to let FIE work correctly. > > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Juri Lelli <juri.lelli@arm.com> > Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> > --- > arch/arm/include/asm/topology.h | 5 +++++ > arch/arm/kernel/topology.c | 1 - > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h > index 370f7a732900..ca05d1b90411 100644 > --- a/arch/arm/include/asm/topology.h > +++ b/arch/arm/include/asm/topology.h > @@ -24,6 +24,11 @@ void init_cpu_topology(void); > void store_cpu_topology(unsigned int cpuid); > const struct cpumask *cpu_coregroup_mask(int cpu); > > +#include <linux/arch_topology.h> > + > +/* Subscribe for input data for frequency-invariant load-tracking */ > +#define arch_set_freq_scale topology_set_freq_scale > + > #else > > static inline void init_cpu_topology(void) { } > diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c > index bf949a763dbe..2c47a76c67b0 100644 > --- a/arch/arm/kernel/topology.c > +++ b/arch/arm/kernel/topology.c > @@ -11,7 +11,6 @@ > * for more details. > */ > > -#include <linux/arch_topology.h> Why is this diff part of this patch ?
On 06/07/17 11:42, Viresh Kumar wrote: > On 06-07-17, 10:49, Dietmar Eggemann wrote: >> Define arch_set_freq_scale to be the arch_topology "driver" function >> topology_set_freq_scale() to let FIE work correctly. >> >> Cc: Russell King <linux@arm.linux.org.uk> >> Cc: Juri Lelli <juri.lelli@arm.com> >> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> >> --- >> arch/arm/include/asm/topology.h | 5 +++++ >> arch/arm/kernel/topology.c | 1 - >> 2 files changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h >> index 370f7a732900..ca05d1b90411 100644 >> --- a/arch/arm/include/asm/topology.h >> +++ b/arch/arm/include/asm/topology.h >> @@ -24,6 +24,11 @@ void init_cpu_topology(void); >> void store_cpu_topology(unsigned int cpuid); >> const struct cpumask *cpu_coregroup_mask(int cpu); >> >> +#include <linux/arch_topology.h> >> + >> +/* Subscribe for input data for frequency-invariant load-tracking */ >> +#define arch_set_freq_scale topology_set_freq_scale >> + >> #else >> >> static inline void init_cpu_topology(void) { } >> diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c >> index bf949a763dbe..2c47a76c67b0 100644 >> --- a/arch/arm/kernel/topology.c >> +++ b/arch/arm/kernel/topology.c >> @@ -11,7 +11,6 @@ >> * for more details. >> */ >> >> -#include <linux/arch_topology.h> > > Why is this diff part of this patch ? Since 'arch/$ARCH/include/asm/topology.h' now includes 'include/linux/arch_topology.h' and 'arch/$ARCH/kernel/topology.c' already includes 'arch/$ARCH/include/asm/topology.h' I thought it's a good idea to get rid of this include here.
On 10-07-17, 16:13, Dietmar Eggemann wrote: > Since 'arch/$ARCH/include/asm/topology.h' now includes > 'include/linux/arch_topology.h' and 'arch/$ARCH/kernel/topology.c' > already includes 'arch/$ARCH/include/asm/topology.h' I thought it's a > good idea to get rid of this include here. Ahh, makes sense.
diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h index 370f7a732900..ca05d1b90411 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -24,6 +24,11 @@ void init_cpu_topology(void); void store_cpu_topology(unsigned int cpuid); const struct cpumask *cpu_coregroup_mask(int cpu); +#include <linux/arch_topology.h> + +/* Subscribe for input data for frequency-invariant load-tracking */ +#define arch_set_freq_scale topology_set_freq_scale + #else static inline void init_cpu_topology(void) { } diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index bf949a763dbe..2c47a76c67b0 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -11,7 +11,6 @@ * for more details. */ -#include <linux/arch_topology.h> #include <linux/cpu.h> #include <linux/cpufreq.h> #include <linux/cpumask.h>
Define arch_set_freq_scale to be the arch_topology "driver" function topology_set_freq_scale() to let FIE work correctly. Cc: Russell King <linux@arm.linux.org.uk> Cc: Juri Lelli <juri.lelli@arm.com> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> --- arch/arm/include/asm/topology.h | 5 +++++ arch/arm/kernel/topology.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-)