The patch titled
     mm/nommu.c: fix remap_pfn_range()
has been removed from the -mm tree.  Its filename was
     mm-nommuc-fix-remap_pfn_range.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: mm/nommu.c: fix remap_pfn_range()
From: Bob Liu <lliu...@gmail.com>

remap_pfn_range() means map physical address pfn<<PAGE_SHIFT to user addr.

For nommu arch it's implemented by vma->vm_start = pfn << PAGE_SHIFT which
is wrong acroding the original meaning of this function.  And some driver
developer using remap_pfn_range() with correct parameter will get
unexpected result because vm_start is changed.  It should be implementd
like addr = pfn << PAGE_SHIFT but which is meanless on nommu arch, this
patch just make it simply return.

Parameter name and setting of vma->vm_flags also be fixed.

Signed-off-by: Bob Liu <lliu...@gmail.com>
Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
Cc: David Howells <dhowe...@redhat.com>
Acked-by: Greg Ungerer <g...@uclinux.org>
Cc: Mike Frysinger <vap...@gentoo.org>
Cc: Bob Liu <lliu...@gmail.com>
Cc: <sta...@kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---

 mm/nommu.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff -puN mm/nommu.c~mm-nommuc-fix-remap_pfn_range mm/nommu.c
--- a/mm/nommu.c~mm-nommuc-fix-remap_pfn_range
+++ a/mm/nommu.c
@@ -1813,10 +1813,13 @@ struct page *follow_page(struct vm_area_
        return NULL;
 }
 
-int remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
-               unsigned long to, unsigned long size, pgprot_t prot)
+int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
+               unsigned long pfn, unsigned long size, pgprot_t prot)
 {
-       vma->vm_start = vma->vm_pgoff << PAGE_SHIFT;
+       if (addr != (pfn << PAGE_SHIFT))
+               return -EINVAL;
+
+       vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
        return 0;
 }
 EXPORT_SYMBOL(remap_pfn_range);
_

Patches currently in -mm which might be from lliu...@gmail.com are

origin.patch
linux-next.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to