This is a note to let you know that I've just added the patch titled
vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
vm-convert-snd_pcm_lib_mmap_iomem-to-vm_iomap_memory-helper.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 0fe09a45c4848b5b5607b968d959fdc1821c161d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri, 19 Apr 2013 10:01:04 -0700
Subject: vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 0fe09a45c4848b5b5607b968d959fdc1821c161d upstream.
This is my example conversion of a few existing mmap users. The pcm
mmap case is one of the more straightforward ones.
Acked-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/core/pcm_native.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3209,18 +3209,10 @@ EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mm
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);
Patches currently in stable-queue which might be from torvalds@xxxxxxxxxxxxxxxxxxxx are
queue-3.4/vm-convert-snd_pcm_lib_mmap_iomem-to-vm_iomap_memory-helper.patch
queue-3.4/hugetlbfs-add-swap-entry-check-in-follow_hugetlb_page.patch
queue-3.4/kernel-signal.c-stop-info-leak-via-the-tkill-and-the-tgkill-syscalls.patch
queue-3.4/hfsplus-fix-potential-overflow-in-hfsplus_file_truncate.patch
queue-3.4/vm-convert-fb_mmap-to-vm_iomap_memory-helper.patch
queue-3.4/vm-convert-mtdchar-mmap-to-vm_iomap_memory-helper.patch
queue-3.4/vm-convert-hpet-mmap-to-vm_iomap_memory-helper.patch
queue-3.4/vm-add-vm_iomap_memory-helper-function.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html