From 149d843b2217d0fe249507409b79c4541b891eca Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2013 10:01:04 -0700
Subject: [PATCH] --- yaml --- r: 362711 b: refs/heads/master c:
 0fe09a45c4848b5b5607b968d959fdc1821c161d h: refs/heads/master i:   362709:
 1ba8eccbc472aabe788e24d6ce956131d083b588   362707:
 82b560a2615a162073567f19a47b9df801affefe   362703:
 86e447f4b8de8c3852effbc5f4f968aff78e234a v: v3

---
 [refs]                        |  2 +-
 trunk/sound/core/pcm_native.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index fd86660e3603..f75ff1bb8f2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc9bbca8f650e5f738af8806317c0a041a48ae4a
+refs/heads/master: 0fe09a45c4848b5b5607b968d959fdc1821c161d
diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c
index 71ae86ca64ac..eb560fa32321 100644
--- a/trunk/sound/core/pcm_native.c
+++ b/trunk/sound/core/pcm_native.c
@@ -3222,18 +3222,10 @@ EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mmap);
 int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream,
 			   struct vm_area_struct *area)
 {
-	long size;
-	unsigned long offset;
+	struct snd_pcm_runtime *runtime = substream->runtime;;
 
 	area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
-	area->vm_flags |= VM_IO;
-	size = area->vm_end - area->vm_start;
-	offset = area->vm_pgoff << PAGE_SHIFT;
-	if (io_remap_pfn_range(area, area->vm_start,
-				(substream->runtime->dma_addr + offset) >> PAGE_SHIFT,
-				size, area->vm_page_prot))
-		return -EAGAIN;
-	return 0;
+	return vm_iomap_memory(area, runtime->dma_addr, runtime->dma_bytes);
 }
 
 EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem);