mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-25 07:10:11 +01:00
merge in 2.4.3 kernel change.
This commit is contained in:
parent
5a370697aa
commit
e95ee06e0d
2 changed files with 8 additions and 8 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue