patch-2.4.21 linux-2.4.21/drivers/char/drm-4.0/i810_dma.c

• Lines: 24
• Date: 2003-06-13 07:51:32.000000000 -0700
• Orig file: linux-2.4.20/drivers/char/drm-4.0/i810_dma.c
• Orig date: 2002-11-28 15:53:12.000000000 -0800

diff -urN linux-2.4.20/drivers/char/drm-4.0/i810_dma.c linux-2.4.21/drivers/char/drm-4.0/i810_dma.c
@@ -34,6 +34,7 @@
 #include "drmP.h"
 #include "i810_drv.h"
 #include <linux/interrupt.h>	/* For task queue support */
+#include <linux/pagemap.h>
 
 /* in case we don't have a 2.3.99-pre6 kernel or later: */
 #ifndef VM_DONTCOPY
@@ -225,14 +226,9 @@
 		if(buf_priv->currently_mapped != I810_BUF_MAPPED) 
 			return -EINVAL;
 		down_write(&current->mm->mmap_sem);
-#if LINUX_VERSION_CODE < 0x020399
-        	retcode = do_munmap((unsigned long)buf_priv->virtual, 
-				    (size_t) buf->total);
-#else
-        	retcode = do_munmap(current->mm, 
+        	retcode = do_munmap(current->mm,
 				    (unsigned long)buf_priv->virtual, 
 				    (size_t) buf->total);
-#endif
    		up_write(&current->mm->mmap_sem);
 	}
    	buf_priv->currently_mapped = I810_BUF_UNMAPPED;