--- 2.4.0-test10-pre4/drivers/media/video/bttv-driver.c.~1~	Thu Oct 12 03:04:42 2000
+++ 2.4.0-test10-pre4/drivers/media/video/bttv-driver.c	Fri Oct 20 18:32:43 2000
@@ -39,7 +39,6 @@
 #include <linux/sched.h>
 #include <asm/segment.h>
 #include <linux/types.h>
-#include <linux/wrapper.h>
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
 #include <linux/vmalloc.h>
@@ -181,40 +180,17 @@
 static void * rvmalloc(signed long size)
 {
 	void * mem;
-	unsigned long adr, page;
 
 	mem=vmalloc_32(size);
 	if (mem) 
-	{
 		memset(mem, 0, size); /* Clear the ram out, no junk to the user */
-	        adr=(unsigned long) mem;
-		while (size > 0) 
-                {
-	                page = kvirt_to_pa(adr);
-			mem_map_reserve(virt_to_page(__va(page)));
-			adr+=PAGE_SIZE;
-			size-=PAGE_SIZE;
-		}
-	}
 	return mem;
 }
 
 static void rvfree(void * mem, signed long size)
 {
-        unsigned long adr, page;
-        
 	if (mem) 
-	{
-	        adr=(unsigned long) mem;
-		while (size > 0) 
-                {
-	                page = kvirt_to_pa(adr);
-			mem_map_unreserve(virt_to_page(__va(page)));
-			adr+=PAGE_SIZE;
-			size-=PAGE_SIZE;
-		}
 		vfree(mem);
-	}
 }
 
 
--- 2.4.0-test10-pre4/drivers/media/video/videodev.c.~1~	Wed Jul 19 07:35:33 2000
+++ 2.4.0-test10-pre4/drivers/media/video/videodev.c	Fri Oct 20 18:32:38 2000
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/videodev.h>
 #include <linux/init.h>
+#include <linux/wrapper.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -228,6 +229,7 @@
 	int ret = -EINVAL;
 	struct video_device *vfl=video_device[MINOR(file->f_dentry->d_inode->i_rdev)];
 	if(vfl->mmap) {
+		vma_reserve(vma);
 		lock_kernel();
 		ret = vfl->mmap(vfl, (char *)vma->vm_start, 
 				(unsigned long)(vma->vm_end-vma->vm_start));