mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [folded] mm-nommuc-fix-remap_pfn_range-update.patch removed from -mm tree
@ 2011-07-08 22:38 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2011-07-08 22:38 UTC (permalink / raw)
  To: lliubbo, dhowells, geert, gerg, vapier, mm-commits


The patch titled
     mm-nommuc-fix-remap_pfn_range-update
has been removed from the -mm tree.  Its filename was
     mm-nommuc-fix-remap_pfn_range-update.patch

This patch was dropped because it was folded into mm-nommuc-fix-remap_pfn_range.patch

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

------------------------------------------------------
Subject: mm-nommuc-fix-remap_pfn_range-update
From: Bob Liu <lliubbo@gmail.com>

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN mm/nommu.c~mm-nommuc-fix-remap_pfn_range-update mm/nommu.c
--- a/mm/nommu.c~mm-nommuc-fix-remap_pfn_range-update
+++ a/mm/nommu.c
@@ -1813,11 +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;
-	vma->vm_end = vma->vm_start + size;
+	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 lliubbo@gmail.com are

mm-nommuc-fix-remap_pfn_range.patch
linux-next.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-07-08 22:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-08 22:38 [folded] mm-nommuc-fix-remap_pfn_range-update.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).