This is a note to let you know that I've just added the patch titled
vm: convert HPET mmap 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-hpet-mmap-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 2323036dfec8ce3ce6e1c86a49a31b039f3300d1 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri, 19 Apr 2013 09:46:39 -0700
Subject: vm: convert HPET mmap to vm_iomap_memory() helper
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 2323036dfec8ce3ce6e1c86a49a31b039f3300d1 upstream.
This is my example conversion of a few existing mmap users. The HPET
case is simple, widely available, and easy to test (Clemens Ladisch sent
a trivial test-program for it).
Test-program-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/char/hpet.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -373,26 +373,14 @@ static int hpet_mmap(struct file *file,
struct hpet_dev *devp;
unsigned long addr;
- if (((vma->vm_end - vma->vm_start) != PAGE_SIZE) || vma->vm_pgoff)
- return -EINVAL;
-
devp = file->private_data;
addr = devp->hd_hpets->hp_hpet_phys;
if (addr & (PAGE_SIZE - 1))
return -ENOSYS;
- vma->vm_flags |= VM_IO;
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-
- if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,
- PAGE_SIZE, vma->vm_page_prot)) {
- printk(KERN_ERR "%s: io_remap_pfn_range failed\n",
- __func__);
- return -EAGAIN;
- }
-
- return 0;
+ return vm_iomap_memory(vma, addr, PAGE_SIZE);
#else
return -ENOSYS;
#endif
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