summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-06 11:18:50 +0200
committerIngo Molnar <mingo@kernel.org>2012-07-06 11:18:50 +0200
commit40b3c43f042c2ba8915aff5c63708207ed7639cb (patch)
tree3249ad124f33aa664c79df44e6d7c3948d5e73d5 /arch
parent9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff)
parentcba6d0d64ee53772b285d0c0c288deefbeaf7775 (diff)
downloadlinux-40b3c43f042c2ba8915aff5c63708207ed7639cb.tar.bz2
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
Pull low probability CONFIG_RCU_BOOST=y deadlock fix from Paul E. McKenney. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/drivers/mconsole_kern.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 88e466b159dc..43b39d61b538 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -705,7 +705,6 @@ static void stack_proc(void *arg)
struct task_struct *from = current, *to = arg;
to->thread.saved_task = from;
- rcu_switch_from(from);
switch_to(from, to, from);
}