Very Computer

-#define __NO_VERSION__
 #include "i830.h"
 #include "drmP.h"

 #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

                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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 >  #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

 >           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);
 > -

already applied in -bk

                Dave

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/