patch-2.4.0-prerelease linux/drivers/char/mem.c

• Lines: 19
• Date: Fri Dec 29 14:07:21 2000
• Orig file: v2.4.0-test12/linux/drivers/char/mem.c
• Orig date: Sun Nov 19 18:44:06 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -201,6 +201,9 @@
 	if (noncached_address(offset) || (file->f_flags & O_SYNC))
 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
+	/* Don't try to swap out physical pages.. */
+	vma->vm_flags |= VM_RESERVED;
+
 	/*
 	 * Don't dump addresses that are not real memory to a core file.
 	 */
@@ -438,7 +441,7 @@
 static int mmap_zero(struct file * file, struct vm_area_struct * vma)
 {
 	if (vma->vm_flags & VM_SHARED)
-		return map_zero_setup(vma);
+		return shmem_zero_setup(vma);
 	if (zeromap_page_range(vma->vm_start, vma->vm_end - vma->vm_start, vma->vm_page_prot))
 		return -EAGAIN;
 	return 0;