From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754565Ab1ESF2n (ORCPT ); Thu, 19 May 2011 01:28:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56473 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753852Ab1ESF2l (ORCPT ); Thu, 19 May 2011 01:28:41 -0400 Date: Thu, 19 May 2011 07:28:40 +0200 Message-ID: From: Takashi Iwai To: Ben Gardiner Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Subject: Re: [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log In-Reply-To: <1305777158-21361-1-git-send-email-bengardiner@nanometrics.ca> References: <20110519111557.f147fc1e.sfr@canb.auug.org.au> <1305777158-21361-1-git-send-email-bengardiner@nanometrics.ca> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > --- > 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 >