Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index 854ab58e5f6e78b38e3106cb551d6244b7ff4964..b76be5bda6c2f10fd98019bea5730c24b7614e98 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -916,7 +916,7 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
                shp->mlock_user = NULL;
                get_file(shm_file);
                shm_unlock(shp);
-               scan_mapping_unevictable_pages(shm_file->f_mapping);
+               shmem_unlock_mapping(shm_file->f_mapping);
                fput(shm_file);
                goto out;
        }