diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-20 02:57:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-20 02:57:58 -0500 |
| commit | d360b78f99e5d1724279644c8eb51d5cf0de4027 (patch) | |
| tree | 011c67bd0654b141e8f7f9fe1d8e1338b05663ba /kernel/sched | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
| parent | 9ea6c5885681e3d9ce9844ba9dc57371a5cfc6d2 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 240157c13ddc..05e5c1ebc73b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -2802,7 +2802,7 @@ need_resched: | |||
| 2802 | preempt_disable(); | 2802 | preempt_disable(); |
| 2803 | cpu = smp_processor_id(); | 2803 | cpu = smp_processor_id(); |
| 2804 | rq = cpu_rq(cpu); | 2804 | rq = cpu_rq(cpu); |
| 2805 | rcu_note_context_switch(cpu); | 2805 | rcu_note_context_switch(); |
| 2806 | prev = rq->curr; | 2806 | prev = rq->curr; |
| 2807 | 2807 | ||
| 2808 | schedule_debug(prev); | 2808 | schedule_debug(prev); |