2 files changed, 3 insertions, 2 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 0b09447ae04..6ffb769ed95 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -776,7 +776,7 @@ static int de_thread(struct task_struct *tsk)
          * so it is safe to do it under read_lock.
          */
         if (unlikely(tsk->group_leader == child_reaper(tsk)))
-                tsk->nsproxy->pid_ns->child_reaper = tsk;
+                task_active_pid_ns(tsk)->child_reaper = tsk;
 
         zap_other_threads(tsk);
         read_unlock(&tasklist_lock);
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index d6dc72c78bc..e0d064e9764 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -91,7 +91,8 @@ static int loadavg_read_proc(char *page, char **start, off_t off,
                 LOAD_INT(a), LOAD_FRAC(a),
                 LOAD_INT(b), LOAD_FRAC(b),
                 LOAD_INT(c), LOAD_FRAC(c),
-                nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid);
+                nr_running(), nr_threads,
+                task_active_pid_ns(current)->last_pid);
         return proc_calc_metrics(page, start, off, count, eof, len);
 }