diff options
Diffstat (limited to 'arch/um/drivers/mconsole_kern.c')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 79ccfe6c7078..4bd82ac0210f 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -123,7 +123,7 @@ void mconsole_log(struct mc_request *req) | |||
| 123 | 123 | ||
| 124 | void mconsole_proc(struct mc_request *req) | 124 | void mconsole_proc(struct mc_request *req) |
| 125 | { | 125 | { |
| 126 | struct vfsmount *mnt = current->nsproxy->pid_ns->proc_mnt; | 126 | struct vfsmount *mnt = task_active_pid_ns(current)->proc_mnt; |
| 127 | char *buf; | 127 | char *buf; |
| 128 | int len; | 128 | int len; |
| 129 | struct file *file; | 129 | struct file *file; |
| @@ -648,7 +648,7 @@ static void stack_proc(void *arg) | |||
| 648 | struct task_struct *from = current, *to = arg; | 648 | struct task_struct *from = current, *to = arg; |
| 649 | 649 | ||
| 650 | to->thread.saved_task = from; | 650 | to->thread.saved_task = from; |
| 651 | rcu_switch(from, to); | 651 | rcu_user_hooks_switch(from, to); |
| 652 | switch_to(from, to, from); | 652 | switch_to(from, to, from); |
| 653 | } | 653 | } |
| 654 | 654 | ||
