| Submitter | Thomas Gleixner |
|---|---|
| Date | 2009-11-06 22:41:29 |
| Message ID | <20091106223806.641098564@linutronix.de> |
| Download | mbox | patch |
| Permalink | /patch/58244/ |
| State | New |
| Headers | show |
Comments
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 <tglx@linutronix.de> > Cc: Takashi Iwai <tiwai@suse.de> 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) > { > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Patch
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) {
SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Takashi Iwai <tiwai@suse.de> --- sound/oss/dmasound/dmasound_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/