From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the tip tree Date: Wed, 21 Sep 2016 13:23:57 +1000 Message-ID: <20160921132357.3ae9d8dd@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:38489 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbcIUDYA (ORCPT ); Tue, 20 Sep 2016 23:24:00 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Viresh Kumar , Sebastian Andrzej Siewior 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 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 --- 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); /** * cpufreq_add_dev - the cpufreq interface for a CPU device. -- 2.8.1 -- Cheers, Stephen Rothwell