diff --git a/[refs] b/[refs] index 6e06d6f9f2ff..32e4d1b3801a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 206506ccf04b6790d11553a0c8595d1bf65790fe +refs/heads/master: 33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5 diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c index 9fb044f3b345..7efff043ffbf 100644 --- a/trunk/ipc/shm.c +++ b/trunk/ipc/shm.c @@ -294,7 +294,7 @@ static int shm_try_destroy_orphaned(int id, void *p, void *data) void shm_destroy_orphaned(struct ipc_namespace *ns) { down_write(&shm_ids(ns).rw_mutex); - if (&shm_ids(ns).in_use) + if (shm_ids(ns).in_use) idr_for_each(&shm_ids(ns).ipcs_idr, &shm_try_destroy_orphaned, ns); up_write(&shm_ids(ns).rw_mutex); } @@ -306,7 +306,7 @@ void exit_shm(struct task_struct *task) /* Destroy all already created segments, but not mapped yet */ down_write(&shm_ids(ns).rw_mutex); - if (&shm_ids(ns).in_use) + if (shm_ids(ns).in_use) idr_for_each(&shm_ids(ns).ipcs_idr, &shm_try_destroy_current, ns); up_write(&shm_ids(ns).rw_mutex); }