* linux-next: build failure after merge of the sound tree
@ 2011-05-19 1:15 Stephen Rothwell
2011-05-19 3:52 ` [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log Ben Gardiner
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-05-19 1:15 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Ben Gardiner
[-- Attachment #1: Type: text/plain, Size: 740 bytes --]
Hi Takashi,
After merging the sound tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
sound/core/pcm_lib.c:333:40: error: macro "xrun_log" passed 3 arguments, but takes just 2
sound/core/pcm_lib.c: In function 'snd_pcm_update_hw_ptr0':
sound/core/pcm_lib.c:333: error: 'xrun_log' undeclared (first use in this function)
Caused by commit ec08b14483de ("ALSA: sound, core, pcm_lib: xrun_log: log
also in_interrupt"). This build has CONFIG_SND_PCM_XRUN_DEBUG unset.
Please, please, use grep or some search when making API changes.
I have used the sound tree from next-20110518 for today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log
2011-05-19 1:15 linux-next: build failure after merge of the sound tree Stephen Rothwell
@ 2011-05-19 3:52 ` Ben Gardiner
2011-05-19 5:28 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Ben Gardiner @ 2011-05-19 3:52 UTC (permalink / raw)
To: Stephen Rothwell, Takashi Iwai; +Cc: linux-next, linux-kernel, alsa-devel
The xrun_log function was augmented with the in_interrupt parameter whereas the
empty macro definition used when xrun logging is disabled was not.
Add a third parameter to the empty macro definition so as to not cause compiler
errors when xrun logging (CONFIG_SND_PCM_XRUN_DEBUG) is disabled.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics•ca>
---
This fixes the build error caused by ec08b14483de ("ALSA: sound, core, pcm_lib:
xrun_log: log also in_interrupt") -- which was my patch. Sorry for the breakage.
---
sound/core/pcm_lib.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index c8c8091..abfeff16 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -266,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
#else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
#define hw_ptr_error(substream, fmt, args...) do { } while (0)
-#define xrun_log(substream, pos) do { } while (0)
+#define xrun_log(substream, pos, in_interrupt) do { } while (0)
#define xrun_log_show(substream) do { } while (0)
#endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log
2011-05-19 3:52 ` [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log Ben Gardiner
@ 2011-05-19 5:28 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2011-05-19 5:28 UTC (permalink / raw)
To: Ben Gardiner; +Cc: Stephen Rothwell, linux-next, linux-kernel, alsa-devel
At Wed, 18 May 2011 23:52:38 -0400,
Ben Gardiner wrote:
>
> The xrun_log function was augmented with the in_interrupt parameter whereas the
> empty macro definition used when xrun logging is disabled was not.
>
> Add a third parameter to the empty macro definition so as to not cause compiler
> errors when xrun logging (CONFIG_SND_PCM_XRUN_DEBUG) is disabled.
>
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics•ca>
>
> ---
> This fixes the build error caused by ec08b14483de ("ALSA: sound, core, pcm_lib:
> xrun_log: log also in_interrupt") -- which was my patch. Sorry for the breakage.
Applied now. Thanks.
Takashi
>
> ---
> sound/core/pcm_lib.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
> index c8c8091..abfeff16 100644
> --- a/sound/core/pcm_lib.c
> +++ b/sound/core/pcm_lib.c
> @@ -266,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
> #else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
>
> #define hw_ptr_error(substream, fmt, args...) do { } while (0)
> -#define xrun_log(substream, pos) do { } while (0)
> +#define xrun_log(substream, pos, in_interrupt) do { } while (0)
> #define xrun_log_show(substream) do { } while (0)
>
> #endif
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-19 5:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-19 1:15 linux-next: build failure after merge of the sound tree Stephen Rothwell
2011-05-19 3:52 ` [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log Ben Gardiner
2011-05-19 5:28 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox