linux-next: timers tree build failure

linux-next: timers tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

include/linux/hrtimer.h:337: error: expected declaration specifiers or '...' before 'tick_cpu_device'
include/linux/hrtimer.h:337: warning: 'struct tick_device' declared inside parameter list
include/linux/hrtimer.h:337: warning: its scope is only this definition or declaration, which is probably not what you want
include/linux/hrtimer.h:337: warning: data definition has no type or storage class
include/linux/hrtimer.h:337: warning: type defaults to 'int' in declaration of 'DECLARE_PER_CPU'

Caused by commit 2e94d1f71f7e4404d997e6fb4f1618aa147d76f9 ("hrtimer: peek
at the timer queue just before going idle") which added a DECLARE_PER_CPU()
without adding the include of linux/percpu.h.  I added the patch below.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Oct 2008 14:20:28 +1100
Subject: [PATCH] DECLARE_PER_CPU needs linux/percpu.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/hrtimer.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 179e3ea..1bde031 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/wait.h>
+#include <linux/percpu.h>
 
 struct hrtimer_clock_base;
 struct hrtimer_cpu_base;
-- 
1.5.6.5

linux-next: timers tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

sound/core/hrtimer.c: In function 'snd_hrtimer_open':
sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)

See below ... the sound tree changes are now in Linus' tree, so this
needs fixing before the timers tree gets merged.

I have applied the merge fix below (which is also in the sound tree) to
the timers tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Date: Mon, 15 Dec 2008 15:43:01 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-next@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>, Ingo
 Molnar <mingo@elte.hu>
Subject: linux-next: sound tree build failure

Hi Takashi,

Today's linux-next build (x86_64 allmodconfig) failed like this:

sound/core/hrtimer.c: In function 'snd_hrtimer_open':
sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)

An interaction between commit bbaf5e97337287479eb78dbc3822d9560bbfd2e2
("ALSA: Add hrtimer backend for ALSA timer interface") from the sound
tree and commit ca109491f612aab5c8152207631c0444f63da97f ("hrtimer:
removing all ur callback modes") from the timers tree.

I have added the below fixup for the merge and can carry it as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 15 Dec 2008 15:38:14 +1100
Subject: [PATCH] sound: fixup for timers tree interaction

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 sound/core/hrtimer.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index c1d2859..34c7d48 100644
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -57,7 +57,6 @@ static int snd_hrtimer_open(struct snd_timer *t)
 		return -ENOMEM;
 	hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 	stime->timer = t;
-	stime->hrt.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED;
 	stime->hrt.function = snd_hrtimer_callback;
 	t->private_data = stime;
 	return 0;
-- 
1.6.0.5

Re: linux-next: timers tree build failure

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> sound/core/hrtimer.c: In function 'snd_hrtimer_open':
> sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
> sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)
> 
> See below ... the sound tree changes are now in Linus' tree, so this
> needs fixing before the timers tree gets merged.
> 
> I have applied the merge fix below (which is also in the sound tree) to 
> the timers tree for today.

yes, trivial oneliner conflict, i pushed out a new auto-timers-next tree.

	Ingo

Re: linux-next: timers tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

Hi Ingo,

On Mon, 29 Dec 2008 10:31:25 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> yes, trivial oneliner conflict, i pushed out a new auto-timers-next tree.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: timers tree build failure

[Takashi Iwai]

At Mon, 29 Dec 2008 10:31:25 +0100,
Ingo Molnar wrote:
> 
> 
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > sound/core/hrtimer.c: In function 'snd_hrtimer_open':
> > sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
> > sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)
> > 
> > See below ... the sound tree changes are now in Linus' tree, so this
> > needs fixing before the timers tree gets merged.
> > 
> > I have applied the merge fix below (which is also in the sound tree) to 
> > the timers tree for today.
> 
> yes, trivial oneliner conflict, i pushed out a new auto-timers-next tree.

Sorry for late jump-in, as I'm just back from vacation.

The for-next branch of sound.git already includes the fix patch (based
on tip/timers/hrtimers), so I wonder why a conflict occurred...  Is it
a conflict fix or is your hrtimers branch rebased?


thanks,

Takashi

Re: linux-next: timers tree build failure

[Takashi Iwai]

At Wed, 31 Dec 2008 11:43:09 +0100,
I wrote:
> 
> At Mon, 29 Dec 2008 10:31:25 +0100,
> Ingo Molnar wrote:
> > 
> > 
> > * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > Hi all,
> > > 
> > > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > > 
> > > sound/core/hrtimer.c: In function 'snd_hrtimer_open':
> > > sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
> > > sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)
> > > 
> > > See below ... the sound tree changes are now in Linus' tree, so this
> > > needs fixing before the timers tree gets merged.
> > > 
> > > I have applied the merge fix below (which is also in the sound tree) to 
> > > the timers tree for today.
> > 
> > yes, trivial oneliner conflict, i pushed out a new auto-timers-next tree.
> 
> Sorry for late jump-in, as I'm just back from vacation.
> 
> The for-next branch of sound.git already includes the fix patch (based
> on tip/timers/hrtimers), so I wonder why a conflict occurred...  Is it
> a conflict fix or is your hrtimers branch rebased?

Never mind, I found that Linus already pulled your fix.
Now I'll fix for-next branch on sound.git tree.


thanks,

Takashi