merge in 2.4.3 kernel change.
parent
301a1ad315
commit
e407c2f5a6
|
@ -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…
Reference in New Issue