diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-10-16 16:06:53 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-10-16 16:06:53 -0700 |
| commit | 280330fac48280e16454cfa46c368af4812ad79c (patch) | |
| tree | 18b9ed796c57e3929e50b9b03f2c6501740b03d6 /net/core/net_namespace.c | |
| parent | d0d51a97063db4704a5ef6bc978dddab1636a306 (diff) | |
| parent | 4fe89d07dcc2804c8b562f6c7896a45643d34b2f (diff) | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'net/core/net_namespace.c')
| -rw-r--r-- | net/core/net_namespace.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 6b9f19122ec1..0ec2f5906a27 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -18,7 +18,6 @@ #include <linux/user_namespace.h> #include <linux/net_namespace.h> #include <linux/sched/task.h> -#include <linux/sched/mm.h> #include <linux/uidgid.h> #include <linux/cookie.h> @@ -1144,13 +1143,7 @@ static int __register_pernet_operations(struct list_head *list, * setup_net() and cleanup_net() are not possible. */ for_each_net(net) { - struct mem_cgroup *old, *memcg; - - memcg = mem_cgroup_or_root(get_mem_cgroup_from_obj(net)); - old = set_active_memcg(memcg); error = ops_init(ops, net); - set_active_memcg(old); - mem_cgroup_put(memcg); if (error) goto out_undo; list_add_tail(&net->exit_list, &net_exit_list); |