Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7a25dd9e042b2b94202a67e5551112f4ac87285a

Authored by Davidlohr Bueso
Committed by Linus Torvalds
1 parent 32a2750010
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ipc, shm: drop shm_lock_check 

This function was replaced by a the lockless shm_obtain_object_check(),
and no longer has any users.

Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 0 additions and 11 deletions Side-by-side Diff

... ... @@ -167,17 +167,6 @@
167 167 ipc_lock_object(&ipcp->shm_perm);
168 168 }
169 169  
170   -static inline struct shmid_kernel *shm_lock_check(struct ipc_namespace *ns,
171   - int id)
172   -{
173   - struct kern_ipc_perm *ipcp = ipc_lock_check(&shm_ids(ns), id);
174   -
175   - if (IS_ERR(ipcp))
176   - return (struct shmid_kernel *)ipcp;
177   -
178   - return container_of(ipcp, struct shmid_kernel, shm_perm);
179   -}
180   -
181 170 static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s)
182 171 {
183 172 ipc_rmid(&shm_ids(ns), &s->shm_perm);