From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Takashi Iwai <tiwai@suse•de>
Subject: linux-next: timers tree build failure
Date: Mon, 29 Dec 2008 13:30:28 +1100 [thread overview]
Message-ID: <20081229133028.363f5094.sfr@canb.auug.org.au> (raw)
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
next reply other threads:[~2008-12-29 2:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 2:30 Stephen Rothwell [this message]
2008-12-29 9:31 ` linux-next: timers tree build failure Ingo Molnar
2008-12-29 10:14 ` Stephen Rothwell
2008-12-31 10:43 ` Takashi Iwai
2008-12-31 10:57 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2008-10-15 3:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081229133028.363f5094.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox