aboutsummaryrefslogtreecommitdiff
path: root/kernel/rcutree.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-18 23:58:24 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-18 23:58:24 +0200
commit823d93640927d739f7c918b73fe5ec494fb27e17 (patch)
treedea028ddd214541b76c1c26f5f21ddc46157e67e /kernel/rcutree.c
parent7664e969359917ba3212c5d6efdec494eaf8586e (diff)
parentd9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff)
downloadlinux-linaro-stable-823d93640927d739f7c918b73fe5ec494fb27e17.tar.gz
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
Diffstat (limited to 'kernel/rcutree.c')
-rw-r--r--kernel/rcutree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 38ecdda3f55f..4b97bba7396e 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -201,6 +201,7 @@ void rcu_note_context_switch(int cpu)
{
trace_rcu_utilization("Start context switch");
rcu_sched_qs(cpu);
+ rcu_preempt_note_context_switch(cpu);
trace_rcu_utilization("End context switch");
}
EXPORT_SYMBOL_GPL(rcu_note_context_switch);