1 files changed, 7 insertions, 6 deletions

diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index a0da7755fcea..4067f1548949 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -575,7 +575,8 @@ static void loopback_runtime_free(struct snd_pcm_runtime *runtime)
 static int loopback_hw_params(struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *params)
 {
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+        return snd_pcm_lib_alloc_vmalloc_buffer(substream,
+                                                params_buffer_bytes(params));
 }
 
 static int loopback_hw_free(struct snd_pcm_substream *substream)
@@ -587,7 +588,7 @@ static int loopback_hw_free(struct snd_pcm_substream *substream)
         mutex_lock(&dpcm->loopback->cable_lock);
         cable->valid &= ~(1 << substream->stream);
         mutex_unlock(&dpcm->loopback->cable_lock);
-        return snd_pcm_lib_free_pages(substream);
+        return snd_pcm_lib_free_vmalloc_buffer(substream);
 }
 
 static unsigned int get_cable_index(struct snd_pcm_substream *substream)
@@ -740,6 +741,8 @@ static struct snd_pcm_ops loopback_playback_ops = {
         .prepare =      loopback_prepare,
         .trigger =      loopback_trigger,
         .pointer =      loopback_pointer,
+        .page =         snd_pcm_lib_get_vmalloc_page,
+        .mmap =         snd_pcm_lib_mmap_vmalloc,
 };
 
 static struct snd_pcm_ops loopback_capture_ops = {
@@ -751,6 +754,8 @@ static struct snd_pcm_ops loopback_capture_ops = {
         .prepare =      loopback_prepare,
         .trigger =      loopback_trigger,
         .pointer =      loopback_pointer,
+        .page =         snd_pcm_lib_get_vmalloc_page,
+        .mmap =         snd_pcm_lib_mmap_vmalloc,
 };
 
 static int __devinit loopback_pcm_new(struct loopback *loopback,
@@ -771,10 +776,6 @@ static int __devinit loopback_pcm_new(struct loopback *loopback,
         strcpy(pcm->name, "Loopback PCM");
 
         loopback->pcm[device] = pcm;
-
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
-                        snd_dma_continuous_data(GFP_KERNEL),
-                        0, 2 * 1024 * 1024);
         return 0;
 }