diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 16:14:49 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-08-27 16:14:49 +0300 |
| commit | 8ce0436789b006622fcb6baea0c29b99385612dd (patch) | |
| tree | 9da56689f451c3644aa044d13e58caf978cd6f2e /ipc/msg.c | |
| parent | ed1094012ae82798de33bad0ba1cc5f19a005e68 (diff) | |
| parent | fabf08a0cd63ce39287646ceea10ac34781418f4 (diff) | |
| download | linux-8ce0436789b006622fcb6baea0c29b99385612dd.tar.xz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.14
Diffstat (limited to 'ipc/msg.c')
| -rw-r--r-- | ipc/msg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 5b25e0755656..2c38f10d1483 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -1034,7 +1034,8 @@ void msg_exit_ns(struct ipc_namespace *ns) static int sysvipc_msg_proc_show(struct seq_file *s, void *it) { struct user_namespace *user_ns = seq_user_ns(s); - struct msg_queue *msq = it; + struct kern_ipc_perm *ipcp = it; + struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm); seq_printf(s, "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n", |