diff --git a/[refs] b/[refs]
index acda52dd64f5..ab386e1fb7b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f607e7fc5fb94d92030c4527287e9c149ddf9e65
+refs/heads/master: 8f3b1327aa454bc8283e96bca7669c3c88b83f79
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 1fd0c51b10a6..9edc897a3970 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1813,10 +1813,13 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address,
 	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);