Subject: Re: linux-next: sound tree build failure

From: Takashi Iwai <[email-masked]>
Date: Mon, 15 Dec 2008 08:36:20 +0100

At Mon, 15 Dec 2008 15:43:01 +1100,
Stephen Rothwell wrote:
> 
> 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.

Thanks, the fix must be correct.

I'm not sure what I should do.  Putting this fix only for linux-next
might be a fix, but this wouldn't work if the affecting patch is
changed or dropped.

If you can keep this one-liner in your tree, it'd be helpful.

Takashi

> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> http://www.canb.auug.org.au/~sfr/
> 
> From: Stephen Rothwell <[email-masked]>
> Date: Mon, 15 Dec 2008 15:38:14 +1100
> Subject: [PATCH] sound: fixup for timers tree interaction
> 
> Signed-off-by: Stephen Rothwell <[email-masked]>
> ---
>  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
>