merge in 2.4.3 kernel change.

This commit is contained in:
Alan Hourihane 2001-03-30 13:33:52 +00:00
parent 5a370697aa
commit e95ee06e0d
2 changed files with 8 additions and 8 deletions

View file

@ -768,18 +768,18 @@ int DRM(mapbufs)( struct inode *inode, struct file *filp,
goto done;
}
down( &current->mm->mmap_sem );
down_write( &current->mm->mmap_sem );
virtual = do_mmap( filp, 0, map->size,
PROT_READ | PROT_WRITE,
MAP_SHARED,
(unsigned long)map->offset );
up( &current->mm->mmap_sem );
up_write( &current->mm->mmap_sem );
} else {
down( &current->mm->mmap_sem );
down_write( &current->mm->mmap_sem );
virtual = do_mmap( filp, 0, dma->byte_count,
PROT_READ | PROT_WRITE,
MAP_SHARED, 0 );
up( &current->mm->mmap_sem );
up_write( &current->mm->mmap_sem );
}
if ( virtual > -1024UL ) {
/* Real error */

View file

@ -768,18 +768,18 @@ int DRM(mapbufs)( struct inode *inode, struct file *filp,
goto done;
}
down( &current->mm->mmap_sem );
down_write( &current->mm->mmap_sem );
virtual = do_mmap( filp, 0, map->size,
PROT_READ | PROT_WRITE,
MAP_SHARED,
(unsigned long)map->offset );
up( &current->mm->mmap_sem );
up_write( &current->mm->mmap_sem );
} else {
down( &current->mm->mmap_sem );
down_write( &current->mm->mmap_sem );
virtual = do_mmap( filp, 0, dma->byte_count,
PROT_READ | PROT_WRITE,
MAP_SHARED, 0 );
up( &current->mm->mmap_sem );
up_write( &current->mm->mmap_sem );
}
if ( virtual > -1024UL ) {
/* Real error */