From f386785e1e185010d69b3f9c7b372d4494fc40ac Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Fri, 18 Dec 2009 09:27:24 +0100
Subject: [PATCH] --- yaml --- r: 178108 b: refs/heads/master c:
 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/sound/mips/sgio2audio.c                | 2 +-
 trunk/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 2 +-
 trunk/sound/usb/usbaudio.c                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9584f2f351f3..89a4257e021d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbe74b90bafebce615466b4c20f96b0465df1ae
+refs/heads/master: 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe
diff --git a/trunk/sound/mips/sgio2audio.c b/trunk/sound/mips/sgio2audio.c
index 8691f4cf6191..f1d9d16b5486 100644
--- a/trunk/sound/mips/sgio2audio.c
+++ b/trunk/sound/mips/sgio2audio.c
@@ -609,7 +609,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream,
 	/* alloc virtual 'dma' area */
 	if (runtime->dma_area)
 		vfree(runtime->dma_area);
-	runtime->dma_area = vmalloc(size);
+	runtime->dma_area = vmalloc_user(size);
 	if (runtime->dma_area == NULL)
 		return -ENOMEM;
 	runtime->dma_bytes = size;
diff --git a/trunk/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/trunk/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index d057e6489643..5cfa608823f7 100644
--- a/trunk/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/trunk/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -51,7 +51,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s
 			return 0; /* already enough large */
 		vfree(runtime->dma_area);
 	}
-	runtime->dma_area = vmalloc_32(size);
+	runtime->dma_area = vmalloc_32_user(size);
 	if (! runtime->dma_area)
 		return -ENOMEM;
 	runtime->dma_bytes = size;
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
index b074a594c595..4963defee18a 100644
--- a/trunk/sound/usb/usbaudio.c
+++ b/trunk/sound/usb/usbaudio.c
@@ -752,7 +752,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s
 			return 0; /* already large enough */
 		vfree(runtime->dma_area);
 	}
-	runtime->dma_area = vmalloc(size);
+	runtime->dma_area = vmalloc_user(size);
 	if (!runtime->dma_area)
 		return -ENOMEM;
 	runtime->dma_bytes = size;