summaryrefslogtreecommitdiff
path: root/kernel/sched
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-11-20 07:57:58 (GMT)
committerIngo Molnar <mingo@kernel.org>2014-11-20 07:57:58 (GMT)
commitd360b78f99e5d1724279644c8eb51d5cf0de4027 (patch)
tree011c67bd0654b141e8f7f9fe1d8e1338b05663ba /kernel/sched
parentfc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff)
parent9ea6c5885681e3d9ce9844ba9dc57371a5cfc6d2 (diff)
downloadlinux-d360b78f99e5d1724279644c8eb51d5cf0de4027.tar.xz
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney: - Streamline RCU's use of per-CPU variables, shifting from "cpu" arguments to functions to "this_"-style per-CPU variable accessors. - Signal-handling RCU updates. - Real-time updates. - Torture-test updates. - Miscellaneous fixes. - Documentation updates. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 240157c..05e5c1e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2802,7 +2802,7 @@ need_resched:
preempt_disable();
cpu = smp_processor_id();
rq = cpu_rq(cpu);
- rcu_note_context_switch(cpu);
+ rcu_note_context_switch();
prev = rq->curr;
schedule_debug(prev);