Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[deliverable/linux.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index bd9c91f433c1f49448e4da80fce4507d17b0d191..06e5cf2fe019faee43aa9f8ca9f17cad4973b74d 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -129,7 +129,7 @@ void __init shm_init(void)
 
 static inline struct shmid_kernel *shm_obtain_object(struct ipc_namespace *ns, int id)
 {
-       struct kern_ipc_perm *ipcp = ipc_obtain_object(&shm_ids(ns), id);
+       struct kern_ipc_perm *ipcp = ipc_obtain_object_idr(&shm_ids(ns), id);
 
        if (IS_ERR(ipcp))
                return ERR_CAST(ipcp);