git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
synth
/
util_mem.c
diff --git
a/sound/synth/util_mem.c
b/sound/synth/util_mem.c
index
217e8e5
..
1d9b11f
100644
(file)
--- a/
sound/synth/util_mem.c
+++ b/
sound/synth/util_mem.c
@@
-18,6
+18,7
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/mutex.h>
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
@@
-42,7
+43,7
@@
snd_util_memhdr_new(int memsize)
if (hdr == NULL)
return NULL;
hdr->size = memsize;
if (hdr == NULL)
return NULL;
hdr->size = memsize;
-
init_MUTEX
(&hdr->block_mutex);
+
mutex_init
(&hdr->block_mutex);
INIT_LIST_HEAD(&hdr->block);
return hdr;
INIT_LIST_HEAD(&hdr->block);
return hdr;
@@
-136,9
+137,9
@@
struct snd_util_memblk *
snd_util_mem_alloc(struct snd_util_memhdr *hdr, int size)
{
struct snd_util_memblk *blk;
snd_util_mem_alloc(struct snd_util_memhdr *hdr, int size)
{
struct snd_util_memblk *blk;
-
down
(&hdr->block_mutex);
+
mutex_lock
(&hdr->block_mutex);
blk = __snd_util_mem_alloc(hdr, size);
blk = __snd_util_mem_alloc(hdr, size);
-
up
(&hdr->block_mutex);
+
mutex_unlock
(&hdr->block_mutex);
return blk;
}
return blk;
}
@@
-163,9
+164,9
@@
int snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk)
{
snd_assert(hdr && blk, return -EINVAL);
{
snd_assert(hdr && blk, return -EINVAL);
-
down
(&hdr->block_mutex);
+
mutex_lock
(&hdr->block_mutex);
__snd_util_mem_free(hdr, blk);
__snd_util_mem_free(hdr, blk);
-
up
(&hdr->block_mutex);
+
mutex_unlock
(&hdr->block_mutex);
return 0;
}
return 0;
}
@@
-175,9
+176,9
@@
int snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk)
int snd_util_mem_avail(struct snd_util_memhdr *hdr)
{
unsigned int size;
int snd_util_mem_avail(struct snd_util_memhdr *hdr)
{
unsigned int size;
-
down
(&hdr->block_mutex);
+
mutex_lock
(&hdr->block_mutex);
size = hdr->size - hdr->used;
size = hdr->size - hdr->used;
-
up
(&hdr->block_mutex);
+
mutex_unlock
(&hdr->block_mutex);
return size;
}
return size;
}