remove do munmap 4 args
authorDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 10:51:30 +0000 (21:51 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 10:51:30 +0000 (21:51 +1100)
linux-core/i810_dma.c
linux-core/i830_dma.c

index bdbb31f..3126796 100644 (file)
 #include "i810_drm.h"
 #include "i810_drv.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 I810_BUF_FREE          2
 #define I810_BUF_CLIENT                1
 #define I810_BUF_HARDWARE              0
@@ -186,7 +180,7 @@ static int i810_unmap_buffer(drm_buf_t * buf)
                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);
index 4526ccf..a1b7079 100644 (file)
 #include "i830_drm.h"
 #include "i830_drv.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
@@ -174,7 +168,7 @@ static int i830_unmap_buffer(drm_buf_t * buf)
                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);