Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5b657ee authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

ALSA: seq: Enable 'use' locking in all configurations 



commit 8009d506a1dd00cf436b0c4cca0dcec130580a21 upstream.

The 'use' locking macros are no-ops if neither SMP or SND_DEBUG is
enabled.  This might once have been OK in non-preemptible
configurations, but even in that case snd_seq_read() may sleep while
relying on a 'use' lock.  So always use the proper implementations.

Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 710c0b07

sound/core/seq/seq_lock.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <sound/core.h>

#include <sound/core.h>

#include "seq_lock.h"

#include "seq_lock.h"





#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)



/* wait until all locks are released */

/* wait until all locks are released */

void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)

void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)

{

{
@@ -42,5 +40,3 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line) 
}

}





EXPORT_SYMBOL(snd_use_lock_sync_helper);
 
EXPORT_SYMBOL(snd_use_lock_sync_helper);
 


#endif

sound/core/seq/seq_lock.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -3,8 +3,6 @@ 




#include <linux/sched.h>

#include <linux/sched.h>





#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)



typedef atomic_t snd_use_lock_t;

typedef atomic_t snd_use_lock_t;





/* initialize lock */

/* initialize lock */
@@ -20,14 +18,4 @@ typedef atomic_t snd_use_lock_t; 
void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);

void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);

#define snd_use_lock_sync(lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__, __LINE__)

#define snd_use_lock_sync(lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__, __LINE__)





#else /* SMP || CONFIG_SND_DEBUG */



typedef spinlock_t snd_use_lock_t;	/* dummy */

#define snd_use_lock_init(lockp) /**/

#define snd_use_lock_use(lockp) /**/

#define snd_use_lock_free(lockp) /**/

#define snd_use_lock_sync(lockp) /**/



#endif /* SMP || CONFIG_SND_DEBUG */



#endif /* __SND_SEQ_LOCK_H */
 
#endif /* __SND_SEQ_LOCK_H */