diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/char/drm/r128_bufs.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/char/drm/r128_bufs.c')
| -rw-r--r-- | drivers/char/drm/r128_bufs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/r128_bufs.c b/drivers/char/drm/r128_bufs.c index a060749e3..5b35752b5 100644 --- a/drivers/char/drm/r128_bufs.c +++ b/drivers/char/drm/r128_bufs.c @@ -249,17 +249,17 @@ int r128_mapbufs(struct inode *inode, struct file *filp, unsigned int cmd, 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 */ |