From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751281AbZKGJUd (ORCPT ); Sat, 7 Nov 2009 04:20:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751244AbZKGJUd (ORCPT ); Sat, 7 Nov 2009 04:20:33 -0500 Received: from cantor.suse.de ([195.135.220.2]:57363 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751180AbZKGJUc (ORCPT ); Sat, 7 Nov 2009 04:20:32 -0500 Date: Sat, 07 Nov 2009 10:20:36 +0100 Message-ID: From: Takashi Iwai To: Thomas Gleixner Cc: LKML , Ingo Molnar , Peter Zijlstra Subject: Re: [patch 06/16] sound: Replace old style lock initializer In-Reply-To: <20091106223806.641098564@linutronix.de> References: <20091106223547.784916750@linutronix.de> <20091106223806.641098564@linutronix.de> 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.1 (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 Fri, 06 Nov 2009 22:41:29 -0000, Thomas Gleixner wrote: > > SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. > > Signed-off-by: Thomas Gleixner > Cc: Takashi Iwai Applied to sound git tree now. Thanks! Takashi > --- > sound/oss/dmasound/dmasound_core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > Index: linux-2.6/sound/oss/dmasound/dmasound_core.c > =================================================================== > --- linux-2.6.orig/sound/oss/dmasound/dmasound_core.c > +++ linux-2.6/sound/oss/dmasound/dmasound_core.c > @@ -219,7 +219,9 @@ static int shared_resources_initialised; > * Mid level stuff > */ > > -struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED }; > +struct sound_settings dmasound = { > + .lock = __SPIN_LOCK_UNLOCKED(dmasound.lock) > +}; > > static inline void sound_silence(void) > { > >