2003-01-29 07:04:09

by John Kim

Subject: [PATCH 2.5.59] trivial cleanup of DRM 4.0 code from i830 driver

I found some old DRM 4.0 code in 2.5.59. Here is patch to remove them.

John Kim


--- linux-2.5.59/drivers/char/drm/i830_dma.c 2003-01-16 21:21:38.000000000 -0500
+++ linux-2.5.59-new/drivers/char/drm/i830_dma.c 2003-01-29 02:06:25.000000000 -0500
@@ -40,12 +40,6 @@
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>

-#ifdef DO_MUNMAP_4_ARGS
-#define DO_MUNMAP(m, a, l) do_munmap(m, a, l, 1)
-#else
-#define DO_MUNMAP(m, a, l) do_munmap(m, a, l)
-#endif
-
#define I830_BUF_FREE 2
#define I830_BUF_CLIENT 1
#define I830_BUF_HARDWARE 0
@@ -230,7 +224,7 @@
return -EINVAL;

down_write(&current->mm->mmap_sem);
- retcode = DO_MUNMAP(current->mm,
+ retcode = do_munmap(current->mm,
(unsigned long)buf_priv->virtual,
(size_t) buf->total);
up_write(&current->mm->mmap_sem);