diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 16:49:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 16:49:46 +0200 |
| commit | 636bf35880e5a79c2ecb10640137bbd9a4681cb7 (patch) | |
| tree | 919ea9ac007b72acb92a99fb7e28c8238a69573f /ipc/msg.c | |
| parent | 276c87054751bb6adfa160a6e68e47b97592a897 (diff) | |
| parent | 8d31f80eb38819e4f2905ad21c0e8998382a08f7 (diff) | |
Merge branch 'linus' into x86/platform, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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", |