summaryrefslogtreecommitdiffstats
path: root/sound/core/memalloc.c
diff options
context:
space:
mode:
authorAl Viro2005-10-21 09:22:18 +0200
committerLinus Torvalds2005-10-28 17:16:50 +0200
commit1ef64e670e3bc27e0c3c83810ca36e19924c35c6 (patch)
treeb024df98dcbe0bc28c967559da27a14254698887 /sound/core/memalloc.c
parent[PATCH] gfp_t: drivers/infiniband (diff)
downloadkernel-qcow2-linux-1ef64e670e3bc27e0c3c83810ca36e19924c35c6.tar.gz
kernel-qcow2-linux-1ef64e670e3bc27e0c3c83810ca36e19924c35c6.tar.xz
kernel-qcow2-linux-1ef64e670e3bc27e0c3c83810ca36e19924c35c6.zip
[PATCH] gfp_t: sound
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/core/memalloc.c')
-rw-r--r--sound/core/memalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index e72cec77f0db..129abab5ce98 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -190,7 +190,7 @@ static void unmark_pages(struct page *page, int order)
*
* Returns the pointer of the buffer, or NULL if no enoguh memory.
*/
-void *snd_malloc_pages(size_t size, unsigned int gfp_flags)
+void *snd_malloc_pages(size_t size, gfp_t gfp_flags)
{
int pg;
void *res;
@@ -235,7 +235,7 @@ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d
{
int pg;
void *res;
- unsigned int gfp_flags;
+ gfp_t gfp_flags;
snd_assert(size > 0, return NULL);
snd_assert(dma != NULL, return NULL);