diff -urN 2.4.19pre2/drivers/char/ftape/zftape/zftape-init.c vm/drivers/char/ftape/zftape/zftape-init.c
--- 2.4.19pre2/drivers/char/ftape/zftape/zftape-init.c	Tue Jan 22 18:53:29 2002
+++ vm/drivers/char/ftape/zftape/zftape-init.c	Wed Mar  6 04:46:59 2002
@@ -204,6 +204,7 @@
 	sigfillset(&current->blocked);
 	lock_kernel();
 	if ((result = ftape_mmap(vma)) >= 0) {
+		vma->vm_flags &= ~VM_IO;
 #ifndef MSYNC_BUG_WAS_FIXED
 		static struct vm_operations_struct dummy = { NULL, };
 		vma->vm_ops = &dummy;
diff -urN 2.4.19pre2/drivers/char/mem.c vm/drivers/char/mem.c
--- 2.4.19pre2/drivers/char/mem.c	Tue Jan 22 18:56:12 2002
+++ vm/drivers/char/mem.c	Wed Mar  6 04:46:59 2002
@@ -198,10 +198,10 @@
 	vma->vm_flags |= VM_RESERVED;
 
 	/*
-	 * Don't dump addresses that are not real memory to a core file.
+	 * Dump addresses that are real memory to a core file.
 	 */
-	if (offset >= __pa(high_memory) || (file->f_flags & O_SYNC))
-		vma->vm_flags |= VM_IO;
+	if (offset < __pa(high_memory) && !(file->f_flags & O_SYNC))
+		vma->vm_flags &= ~VM_IO;
 
 	if (remap_page_range(vma->vm_start, offset, vma->vm_end-vma->vm_start,
 			     vma->vm_page_prot))
@@ -473,6 +473,7 @@
 		return shmem_zero_setup(vma);
 	if (zeromap_page_range(vma->vm_start, vma->vm_end - vma->vm_start, vma->vm_page_prot))
 		return -EAGAIN;
+	vma->vm_flags &= ~VM_IO;
 	return 0;
 }
 
diff -urN 2.4.19pre2/drivers/media/video/videodev.c vm/drivers/media/video/videodev.c
--- 2.4.19pre2/drivers/media/video/videodev.c	Tue Jan 22 18:54:56 2002
+++ vm/drivers/media/video/videodev.c	Wed Mar  6 04:46:59 2002
@@ -208,6 +208,7 @@
 		lock_kernel();
 		ret = vfl->mmap(vfl, (char *)vma->vm_start, 
 				(unsigned long)(vma->vm_end-vma->vm_start));
+		vma->vm_flags &= ~VM_IO;
 		unlock_kernel();
 	}
 	return ret;
diff -urN 2.4.19pre2/drivers/sound/cmpci.c vm/drivers/sound/cmpci.c
--- 2.4.19pre2/drivers/sound/cmpci.c	Tue Jan 22 18:55:56 2002
+++ vm/drivers/sound/cmpci.c	Wed Mar  6 04:46:59 2002
@@ -1754,6 +1754,7 @@
 	ret = -EINVAL;
 	if (remap_page_range(vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 	ret = 0;
 out:
diff -urN 2.4.19pre2/drivers/sound/cs4281/cs4281m.c vm/drivers/sound/cs4281/cs4281m.c
--- 2.4.19pre2/drivers/sound/cs4281/cs4281m.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/sound/cs4281/cs4281m.c	Wed Mar  6 04:46:59 2002
@@ -3239,6 +3239,7 @@
 	if (remap_page_range
 	    (vma->vm_start, virt_to_phys(db->rawbuf), size,
 	     vma->vm_page_prot)) return -EAGAIN;
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 
 	CS_DBGOUT(CS_FUNCTION | CS_PARMS | CS_OPEN, 4,
diff -urN 2.4.19pre2/drivers/sound/cs46xx.c vm/drivers/sound/cs46xx.c
--- 2.4.19pre2/drivers/sound/cs46xx.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/sound/cs46xx.c	Wed Mar  6 04:46:59 2002
@@ -2468,6 +2468,7 @@
 		ret = -EAGAIN;
 		goto out;
 	}
+	vma->vm_flags &= ~VM_IO;
 	dmabuf->mapped = 1;
 
 	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: cs_mmap()-\n") );
diff -urN 2.4.19pre2/drivers/sound/es1370.c vm/drivers/sound/es1370.c
--- 2.4.19pre2/drivers/sound/es1370.c	Fri Mar  1 00:09:34 2002
+++ vm/drivers/sound/es1370.c	Wed Mar  6 04:46:59 2002
@@ -1377,6 +1377,7 @@
 		ret = -EAGAIN;
 		goto out;
 	}
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 out:
 	up(&s->sem);
diff -urN 2.4.19pre2/drivers/sound/es1371.c vm/drivers/sound/es1371.c
--- 2.4.19pre2/drivers/sound/es1371.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/sound/es1371.c	Wed Mar  6 04:46:59 2002
@@ -1566,6 +1566,7 @@
 		ret = -EAGAIN;
 		goto out;
 	}
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 out:
 	up(&s->sem);
@@ -2133,6 +2134,7 @@
 	ret = -EAGAIN;
 	if (remap_page_range(vma->vm_start, virt_to_phys(s->dma_dac1.rawbuf), size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	s->dma_dac1.mapped = 1;
 	ret = 0;
 out:
diff -urN 2.4.19pre2/drivers/sound/esssolo1.c vm/drivers/sound/esssolo1.c
--- 2.4.19pre2/drivers/sound/esssolo1.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/sound/esssolo1.c	Wed Mar  6 04:46:59 2002
@@ -1247,6 +1247,7 @@
 	ret = -EAGAIN;
 	if (remap_page_range(vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 	ret = 0;
 out:
diff -urN 2.4.19pre2/drivers/sound/i810_audio.c vm/drivers/sound/i810_audio.c
--- 2.4.19pre2/drivers/sound/i810_audio.c	Fri Mar  1 00:09:34 2002
+++ vm/drivers/sound/i810_audio.c	Wed Mar  6 04:46:59 2002
@@ -1679,6 +1679,7 @@
 	if (remap_page_range(vma->vm_start, virt_to_phys(dmabuf->rawbuf),
 			     size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	dmabuf->mapped = 1;
 	dmabuf->trigger = 0;
 	ret = 0;
diff -urN 2.4.19pre2/drivers/sound/ite8172.c vm/drivers/sound/ite8172.c
--- 2.4.19pre2/drivers/sound/ite8172.c	Fri Mar  1 00:09:34 2002
+++ vm/drivers/sound/ite8172.c	Wed Mar  6 04:47:21 2002
@@ -1319,6 +1319,7 @@
 		unlock_kernel();
 		return -EAGAIN;
 	}
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 	unlock_kernel();
 	return 0;
diff -urN 2.4.19pre2/drivers/sound/maestro.c vm/drivers/sound/maestro.c
--- 2.4.19pre2/drivers/sound/maestro.c	Tue Jan 22 18:54:23 2002
+++ vm/drivers/sound/maestro.c	Wed Mar  6 04:46:59 2002
@@ -2512,6 +2512,7 @@
 	ret = -EAGAIN;
 	if (remap_page_range(vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 	ret = 0;
 out:
diff -urN 2.4.19pre2/drivers/sound/maestro3.c vm/drivers/sound/maestro3.c
--- 2.4.19pre2/drivers/sound/maestro3.c	Tue Jan 22 18:55:56 2002
+++ vm/drivers/sound/maestro3.c	Wed Mar  6 04:46:59 2002
@@ -1557,6 +1557,7 @@
     ret = -EAGAIN;
     if (remap_page_range(vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
         goto out;
+    vma->vm_flags &= ~VM_IO;
 
     db->mapped = 1;
     ret = 0;
diff -urN 2.4.19pre2/drivers/sound/rme96xx.c vm/drivers/sound/rme96xx.c
--- 2.4.19pre2/drivers/sound/rme96xx.c	Tue Jan 22 18:55:26 2002
+++ vm/drivers/sound/rme96xx.c	Wed Mar  6 04:46:59 2002
@@ -1429,7 +1429,7 @@
 
 
 /* this is the mapping */
-
+	vma->vm_flags &= ~VM_IO;
 	dma->mmapped = 1;
 	unlock_kernel();
 	return 0;
diff -urN 2.4.19pre2/drivers/sound/sonicvibes.c vm/drivers/sound/sonicvibes.c
--- 2.4.19pre2/drivers/sound/sonicvibes.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/sound/sonicvibes.c	Wed Mar  6 04:46:59 2002
@@ -1551,6 +1551,7 @@
 	ret = -EAGAIN;
 	if (remap_page_range(vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	db->mapped = 1;
 	ret = 0;
 out:
diff -urN 2.4.19pre2/drivers/sound/soundcard.c vm/drivers/sound/soundcard.c
--- 2.4.19pre2/drivers/sound/soundcard.c	Tue Jan 22 18:54:23 2002
+++ vm/drivers/sound/soundcard.c	Wed Mar  6 04:46:59 2002
@@ -481,6 +481,7 @@
 		return -EAGAIN;
 	}
 
+	vma->vm_flags &= ~VM_IO;
 	dmap->mapping_flags |= DMA_MAP_MAPPED;
 
 	if( audio_devs[dev]->d->mmap)
diff -urN 2.4.19pre2/drivers/sound/trident.c vm/drivers/sound/trident.c
--- 2.4.19pre2/drivers/sound/trident.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/sound/trident.c	Wed Mar  6 04:46:59 2002
@@ -2077,6 +2077,7 @@
 	if (remap_page_range(vma->vm_start, virt_to_phys(dmabuf->rawbuf),
 			     size, vma->vm_page_prot))
 		goto out;
+	vma->vm_flags &= ~VM_IO;
 	dmabuf->mapped = 1;
 	ret = 0;
 out:
diff -urN 2.4.19pre2/drivers/sound/ymfpci.c vm/drivers/sound/ymfpci.c
--- 2.4.19pre2/drivers/sound/ymfpci.c	Fri Mar  1 00:09:34 2002
+++ vm/drivers/sound/ymfpci.c	Wed Mar  6 04:46:59 2002
@@ -1536,6 +1536,7 @@
 	if (remap_page_range(vma->vm_start, virt_to_phys(dmabuf->rawbuf),
 			     size, vma->vm_page_prot))
 		return -EAGAIN;
+	vma->vm_flags &= ~VM_IO;
 	dmabuf->mapped = 1;
 
 /* P3 */ printk(KERN_INFO "ymfpci: using memory mapped sound, untested!\n");
diff -urN 2.4.19pre2/drivers/usb/audio.c vm/drivers/usb/audio.c
--- 2.4.19pre2/drivers/usb/audio.c	Mon Feb 25 22:05:08 2002
+++ vm/drivers/usb/audio.c	Wed Mar  6 04:46:59 2002
@@ -2341,6 +2341,7 @@
 	if (vma->vm_pgoff != 0)
 		goto out;
 
+	vma->vm_flags &= ~VM_IO;
 	ret = dmabuf_mmap(db,  vma->vm_start, vma->vm_end - vma->vm_start, vma->vm_page_prot);
 out:
 	unlock_kernel();
diff -urN 2.4.19pre2/fs/ncpfs/mmap.c vm/fs/ncpfs/mmap.c
--- 2.4.19pre2/fs/ncpfs/mmap.c	Tue Jan 22 18:53:53 2002
+++ vm/fs/ncpfs/mmap.c	Wed Mar  6 04:46:59 2002
@@ -119,5 +119,6 @@
 	}
 
 	vma->vm_ops = &ncp_file_mmap;
+	vma->vm_flags &= ~VM_IO;
 	return 0;
 }
diff -urN 2.4.19pre2/ipc/shm.c vm/ipc/shm.c
--- 2.4.19pre2/ipc/shm.c	Fri Mar  1 00:09:39 2002
+++ vm/ipc/shm.c	Wed Mar  6 04:46:59 2002
@@ -159,6 +159,7 @@
 {
 	UPDATE_ATIME(file->f_dentry->d_inode);
 	vma->vm_ops = &shm_vm_ops;
+	vma->vm_flags &= ~VM_IO;
 	shm_inc(file->f_dentry->d_inode->i_ino);
 	return 0;
 }
diff -urN 2.4.19pre2/mm/filemap.c vm/mm/filemap.c
--- 2.4.19pre2/mm/filemap.c	Fri Mar  1 00:09:39 2002
+++ vm/mm/filemap.c	Wed Mar  6 04:46:59 2002
@@ -2183,6 +2183,7 @@
 		return -ENOEXEC;
 	UPDATE_ATIME(inode);
 	vma->vm_ops = &generic_file_vm_ops;
+	vma->vm_flags &= ~VM_IO;
 	return 0;
 }
 
diff -urN 2.4.19pre2/mm/mmap.c vm/mm/mmap.c
--- 2.4.19pre2/mm/mmap.c	Fri Mar  1 00:09:39 2002
+++ vm/mm/mmap.c	Wed Mar  6 04:46:59 2002
@@ -535,6 +535,11 @@
 		}
 		vma->vm_file = file;
 		get_file(file);
+		/*
+		 * Subdrivers can clear VM_IO if their mappings are
+		 * valid pages inside mem_map[]
+		 */
+		vma->vm_flags |= VM_IO;
 		error = file->f_op->mmap(file, vma);
 		if (error)
 			goto unmap_and_free_vma;
diff -urN 2.4.19pre2/mm/shmem.c vm/mm/shmem.c
--- 2.4.19pre2/mm/shmem.c	Fri Mar  1 00:09:39 2002
+++ vm/mm/shmem.c	Wed Mar  6 04:46:59 2002
@@ -657,6 +657,7 @@
 		return -EACCES;
 	UPDATE_ATIME(inode);
 	vma->vm_ops = ops;
+	vma->vm_flags &= ~VM_IO;
 	return 0;
 }
 
diff -urN 2.4.19pre2/net/socket.c vm/net/socket.c
--- 2.4.19pre2/net/socket.c	Tue Jan 22 18:56:30 2002
+++ vm/net/socket.c	Wed Mar  6 04:46:59 2002
@@ -705,6 +705,7 @@
 {
 	struct socket *sock = socki_lookup(file->f_dentry->d_inode);
 
+	vma->vm_flags &= ~VM_IO;
 	return sock->ops->mmap(file, sock, vma);
 }