2012-10-24 03:44:15

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the final tree (pm tree related)

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 :-(

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 <[email protected]>
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 <[email protected]>
---
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
--
1.7.10.280.gaa39

--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (1.76 kB)
(No filename) (836.00 B)
Download all attachments

2012-10-24 03:58:17

by Youquan Song

[permalink] [raw]
Subject: RE: linux-next: build failure after merge of the final tree (pm tree related)

Yes. We already do the patch to fix the warning yesterday after get the information from Fengguang's "0-DAY kernel build testing". But do not refresh linux-next so quickly.
Thanks for the information and patch, Stephen!

-Youquan

-----Original Message-----
From: Stephen Rothwell [mailto:[email protected]]
Sent: Wednesday, October 24, 2012 11:44 AM
To: Rafael J. Wysocki
Cc: [email protected]; [email protected]; Song, Youquan; Rik van Riel
Subject: linux-next: build failure after merge of the final tree (pm tree related)

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 :-(

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 <[email protected]>
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 <[email protected]>
---
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
--
1.7.10.280.gaa39

--
Cheers,
Stephen Rothwell [email protected]

2012-10-24 21:36:54

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree (pm tree related)

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 <[email protected]>
> 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 <[email protected]>
> ---
> 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.