diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2001-03-30 13:33:52 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2001-03-30 13:33:52 +0000 |
| commit | e95ee06e0d2c9859b574c0623c78a5de261a70df (patch) | |
| tree | 70b5d330dc82b6865010e3201cc2533bbcd2fb3a | |
| parent | 5a370697aabda237992dd1ed24bfc554b41eac67 (diff) | |
merge in 2.4.3 kernel change.
| -rw-r--r-- | linux-core/drm_bufs.c | 8 | ||||
| -rw-r--r-- | linux/drm_bufs.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index 63cfb0d4..f310eced 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -768,18 +768,18 @@ int DRM(mapbufs)( struct inode *inode, struct file *filp, goto done; } - down( ¤t->mm->mmap_sem ); + down_write( ¤t->mm->mmap_sem ); virtual = do_mmap( filp, 0, map->size, PROT_READ | PROT_WRITE, MAP_SHARED, (unsigned long)map->offset ); - up( ¤t->mm->mmap_sem ); + up_write( ¤t->mm->mmap_sem ); } else { - down( ¤t->mm->mmap_sem ); + down_write( ¤t->mm->mmap_sem ); virtual = do_mmap( filp, 0, dma->byte_count, PROT_READ | PROT_WRITE, MAP_SHARED, 0 ); - up( ¤t->mm->mmap_sem ); + up_write( ¤t->mm->mmap_sem ); } if ( virtual > -1024UL ) { /* Real error */ diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h index 63cfb0d4..f310eced 100644 --- a/linux/drm_bufs.h +++ b/linux/drm_bufs.h @@ -768,18 +768,18 @@ int DRM(mapbufs)( struct inode *inode, struct file *filp, goto done; } - down( ¤t->mm->mmap_sem ); + down_write( ¤t->mm->mmap_sem ); virtual = do_mmap( filp, 0, map->size, PROT_READ | PROT_WRITE, MAP_SHARED, (unsigned long)map->offset ); - up( ¤t->mm->mmap_sem ); + up_write( ¤t->mm->mmap_sem ); } else { - down( ¤t->mm->mmap_sem ); + down_write( ¤t->mm->mmap_sem ); virtual = do_mmap( filp, 0, dma->byte_count, PROT_READ | PROT_WRITE, MAP_SHARED, 0 ); - up( ¤t->mm->mmap_sem ); + up_write( ¤t->mm->mmap_sem ); } if ( virtual > -1024UL ) { /* Real error */ |