projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 301a1ad)
merge in 2.4.3 kernel change.
authorAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 30 Mar 2001 13:32:39 +0000 (13:32 +0000)
committerAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 30 Mar 2001 13:32:39 +0000 (13:32 +0000)
linux-core/drm_bufs.c patch | blob | history
linux/drm_bufs.h patch | blob | history

diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index 63cfb0d..f310ece 100644 (file)
--- 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( &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 */
diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index 63cfb0d..f310ece 100644 (file)
--- 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( &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 */
Domain: System / Kernel;