2 files changed, 2 insertions, 2 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 35401720635b..fec12eb12471 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -938,8 +938,8 @@ fastcall NORET_TYPE void do_exit(long code)
 
         tsk->exit_code = code;
         proc_exit_connector(tsk);
-        exit_notify(tsk);
         exit_task_namespaces(tsk);
+        exit_notify(tsk);
 #ifdef CONFIG_NUMA
         mpol_free(tsk->mempolicy);
         tsk->mempolicy = NULL;
diff --git a/kernel/pid.c b/kernel/pid.c
index 2efe9d8d367b..78f2aee90f54 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -197,7 +197,7 @@ fastcall void free_pid(struct pid *pid)
         hlist_del_rcu(&pid->pid_chain);
         spin_unlock_irqrestore(&pidmap_lock, flags);
 
-        free_pidmap(current->nsproxy->pid_ns, pid->nr);
+        free_pidmap(&init_pid_ns, pid->nr);
         call_rcu(&pid->rcu, delayed_put_pid);
 }