diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:29 +0800 |
| commit | e779279da78339ec75fa72571ef901a447762cc6 (patch) | |
| tree | 6153fe0215590a435a1f84e5ddd6d84e15edadf1 /ipc/msg.c | |
| parent | 21a48ffe4dff2194cceeecad0436d920c267027c (diff) | |
| parent | e4884275a4bb1cbce5a24a507c3e267c887dc1bd (diff) | |
Merge tag 'v4.4.18' into linux-linaro-lsk-v4.4
This is the 4.4.18 stable release
Diffstat (limited to 'ipc/msg.c')
| -rw-r--r-- | ipc/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 1471db9a7e61..c6521c205cb4 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -680,7 +680,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext, rcu_read_lock(); ipc_lock_object(&msq->q_perm); - ipc_rcu_putref(msq, ipc_rcu_free); + ipc_rcu_putref(msq, msg_rcu_free); /* raced with RMID? */ if (!ipc_valid_object(&msq->q_perm)) { err = -EIDRM; |