summaryrefslogtreecommitdiffstats
path: root/ipc/msg.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2022-12-13 14:28:47 +0100
committerJiri Kosina <jkosina@suse.cz>2022-12-13 14:28:47 +0100
commitab970ae1d63822228bdc84b9c1514efbd2f66da7 (patch)
treefefc08d8dd28e4eb5465ca85de5cce2fb6f1b7ef /ipc/msg.c
parentcfd1f6c16f7deadfe5269a76c1516405c4466481 (diff)
parent163a7fbff7a78c7c055e6c0ad26124ae551fe313 (diff)
downloadlinux-ab970ae1d63822228bdc84b9c1514efbd2f66da7.tar.bz2
Merge branch 'for-6.2/default-remove-cleanup' into for-linus
- removal of superfluous hid_hw_stop() calls for drivers with default .remove callback (Marcus Folkesson)
Diffstat (limited to 'ipc/msg.c')
-rw-r--r--ipc/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index e4e0990e08f7..fd08b3cb36d7 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -1329,11 +1329,11 @@ fail_msg_bytes:
#ifdef CONFIG_IPC_NS
void msg_exit_ns(struct ipc_namespace *ns)
{
- percpu_counter_destroy(&ns->percpu_msg_bytes);
- percpu_counter_destroy(&ns->percpu_msg_hdrs);
free_ipcs(ns, &msg_ids(ns), freeque);
idr_destroy(&ns->ids[IPC_MSG_IDS].ipcs_idr);
rhashtable_destroy(&ns->ids[IPC_MSG_IDS].key_ht);
+ percpu_counter_destroy(&ns->percpu_msg_bytes);
+ percpu_counter_destroy(&ns->percpu_msg_hdrs);
}
#endif