diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-07-11 11:41:07 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-07-11 11:41:07 +0000 |
| commit | 8751b6774da527fdc3773d86da53ad5948b733dc (patch) | |
| tree | 064adbe5b6b4b5d8ab4a8791ddfb5fcfc97f189e /linux-core | |
| parent | 8bc39d01cae622db6097b967c132f9b0e04fb785 (diff) | |
Merge XFree86 4.0.1
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Makefile.kernel | 2 | ||||
| -rw-r--r-- | linux-core/i810_dma.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index a169473a..e262213a 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -9,7 +9,7 @@ # Note 2! The CFLAGS definitions are now inherited from the # parent makes.. # -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.5 2000/02/14 06:27:25 martin Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.6 2000/06/17 00:03:34 martin Exp $ L_TARGET := libdrm.a diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c index 94f35b61..96b7a44f 100644 --- a/linux-core/i810_dma.c +++ b/linux-core/i810_dma.c @@ -211,7 +211,7 @@ static int i810_unmap_buffer(drm_buf_t *buf) if(buf_priv->currently_mapped != I810_BUF_MAPPED) return -EINVAL; down(¤t->mm->mmap_sem); - retcode = do_munmap((unsigned long)buf_priv->virtual, + retcode = do_munmap(current->mm, (unsigned long)buf_priv->virtual, (size_t) buf->total); buf_priv->currently_mapped = I810_BUF_UNMAPPED; buf_priv->virtual = 0; |