Re: linux-next: build failure after merge of the tip tree

Viresh Kumar
2016-09-21T06:44:27Z

On 21-09-16, 13:23, Stephen Rothwell wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/cpufreq/cpufreq.c:1324:12: error: conflicting types for 'cpufreq_offline'
> static int cpufreq_offline(unsigned int cpu)
> ^
> drivers/cpufreq/cpufreq.c:1289:13: note: previous declaration of 'cpufreq_offline' was here
> static void cpufreq_offline(unsigned int cpu);
> ^
>
> Caused by commit
>
> 27622b061eb4 ("cpufreq: Convert to hotplug state machine")
>
> interacting with commit
>
> 26619804e733 ("cpufreq: create link to policy only for registered CPUs")
>
> from the pm tree.
>
> I have applied the foloowing build fix for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 21 Sep 2016 13:20:32 +1000
> Subject: [PATCH] cpufreq: merge fix for type of cpufreq_offline changing
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/cpufreq/cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index 611395cb115e..6e6c1fb60fbc 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -1286,7 +1286,7 @@ out_free_policy:
> return ret;
> }
>
> -static void cpufreq_offline(unsigned int cpu);
> +static int cpufreq_offline(unsigned int cpu);

Thanks and sorry about it. Looks fine.

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

--
viresh