diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 11:18:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-06 11:18:50 +0200 |
| commit | 40b3c43f042c2ba8915aff5c63708207ed7639cb (patch) | |
| tree | 3249ad124f33aa664c79df44e6d7c3948d5e73d5 /kernel/sched/core.c | |
| parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) | |
| parent | cba6d0d64ee53772b285d0c0c288deefbeaf7775 (diff) | |
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 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d5594a4268d..eaead2df6aa 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2081,7 +2081,6 @@ context_switch(struct rq *rq, struct task_struct *prev, #endif /* Here we just switch the register state and the stack. */ - rcu_switch_from(prev); switch_to(prev, next, prev); barrier(); |