From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161235Ab2JXVgy (ORCPT ); Wed, 24 Oct 2012 17:36:54 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:35513 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964877Ab2JXVgx (ORCPT ); Wed, 24 Oct 2012 17:36:53 -0400 From: "Rafael J. Wysocki" To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Youquan Song , Rik van Riel Subject: Re: linux-next: build failure after merge of the final tree (pm tree related) Date: Wed, 24 Oct 2012 23:40:48 +0200 Message-ID: <8858946.fOHz3dP2jS@vostro.rjw.lan> User-Agent: KMail/4.8.5 (Linux/3.6.2-6-desktop; KDE/4.8.5; x86_64; ; ) In-Reply-To: <20121024144400.f5779e119f248256aa183ef5@canb.auug.org.au> References: <20121024144400.f5779e119f248256aa183ef5@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday 24 of October 2012 14:44:00 Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (powerpc > allnoconfig) failed like this: > > In file included from arch/powerpc/kernel/idle.c:27:0: > include/linux/tick.h: In function 'menu_hrtimer_cancel': > include/linux/tick.h:148:48: error: 'return' with a value, in function returning void [-Werror] > > Several of these :-( Sorry for the breakage, it shoule be fixed now. Thanks, Rafael > Caused by commit 25d77b76d7ae ("cpuidle: Quickly notice prediction > failure for repeat mode") from the pm tree. This build has > CONFIG_CPU_IDLE_GOV_MENU turned off. For changes that are obviously > affected by CONFIG options, please test build with the CONFIG option on > and off. > > I have applied the following patch for today: > > From: Stephen Rothwell > Date: Wed, 24 Oct 2012 14:40:47 +1100 > Subject: [PATCH] cpuidle: fix up but return type for inline function > > Fixes this error when CONFIG_CPU_IDLE_GOV_MENU is not enabled: > > In file included from arch/powerpc/kernel/idle.c:27:0: > include/linux/tick.h: In function 'menu_hrtimer_cancel': > include/linux/tick.h:148:48: error: 'return' with a value, in function returning void [-Werror] > > Signed-off-by: Stephen Rothwell > --- > include/linux/tick.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/tick.h b/include/linux/tick.h > index 8867424..40d123e 100644 > --- a/include/linux/tick.h > +++ b/include/linux/tick.h > @@ -145,7 +145,7 @@ static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; } > # ifdef CONFIG_CPU_IDLE_GOV_MENU > extern void menu_hrtimer_cancel(void); > # else > -static inline void menu_hrtimer_cancel(void) { return -1; } > +static inline void menu_hrtimer_cancel(void) { } > # endif /* CONFIG_CPU_IDLE_GOV_MENU */ > > #endif > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.