Hi, Serge,
Could you please have a look at this patch?
Huacai
On Thu, Jul 16, 2020 at 5:37 PM Huacai Chen <chenhc@xxxxxxxxxx> wrote:
>
> Commit ed26aacfb5f71eecb20a ("mips: Add udelay lpj numbers adjustment")
> has backported to 4.4~5.4, but the "struct cpufreq_freqs" (and also the
> cpufreq notifier machanism) of 4.4~4.19 are different from the upstream
> kernel. These differences cause build errors, and this patch can fix the
> build.
>
> Cc: Serge Semin <Sergey.Semin@xxxxxxxxxxxxxxxxxxxx>
> Cc: Stable <stable@xxxxxxxxxxxxxxx> # 4.4/4.9/4.14/4.19
> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
> ---
> arch/mips/kernel/time.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
> index b7f7e08..b15ee12 100644
> --- a/arch/mips/kernel/time.c
> +++ b/arch/mips/kernel/time.c
> @@ -40,10 +40,8 @@ static unsigned long glb_lpj_ref_freq;
> static int cpufreq_callback(struct notifier_block *nb,
> unsigned long val, void *data)
> {
> - struct cpufreq_freqs *freq = data;
> - struct cpumask *cpus = freq->policy->cpus;
> - unsigned long lpj;
> int cpu;
> + struct cpufreq_freqs *freq = data;
>
> /*
> * Skip lpj numbers adjustment if the CPU-freq transition is safe for
> @@ -64,6 +62,7 @@ static int cpufreq_callback(struct notifier_block *nb,
> }
> }
>
> + cpu = freq->cpu;
> /*
> * Adjust global lpj variable and per-CPU udelay_val number in
> * accordance with the new CPU frequency.
> @@ -74,12 +73,8 @@ static int cpufreq_callback(struct notifier_block *nb,
> glb_lpj_ref_freq,
> freq->new);
>
> - for_each_cpu(cpu, cpus) {
> - lpj = cpufreq_scale(per_cpu(pcp_lpj_ref, cpu),
> - per_cpu(pcp_lpj_ref_freq, cpu),
> - freq->new);
> - cpu_data[cpu].udelay_val = (unsigned int)lpj;
> - }
> + cpu_data[cpu].udelay_val = cpufreq_scale(per_cpu(pcp_lpj_ref, cpu),
> + per_cpu(pcp_lpj_ref_freq, cpu), freq->new);
> }
>
> return NOTIFY_OK;
> --
> 2.7.0
>
