summaryrefslogtreecommitdiff
path: root/kernel/cpu
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-06-24 17:45:02 -0700
committerStephen Boyd <sboyd@codeaurora.org>2013-06-24 17:45:02 -0700
commit42cba6e27c4cddc4df701c597dbfa666e1c013c8 (patch)
tree6fe38f37a79391bce3db56f311d0f3b83711fad0 /kernel/cpu
parentf722406faae2d073cc1d01063d1123c35425939e (diff)
parent2699339361a9bacb3fa663e6b8981a040cfca4ee (diff)
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into remove-local-timers
Diffstat (limited to 'kernel/cpu')
-rw-r--r--kernel/cpu/idle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cpu/idle.c b/kernel/cpu/idle.c
index 8b86c0c68edf..d5585f5e038e 100644
--- a/kernel/cpu/idle.c
+++ b/kernel/cpu/idle.c
@@ -40,11 +40,13 @@ __setup("hlt", cpu_idle_nopoll_setup);
static inline int cpu_idle_poll(void)
{
+ rcu_idle_enter();
trace_cpu_idle_rcuidle(0, smp_processor_id());
local_irq_enable();
while (!need_resched())
cpu_relax();
trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
+ rcu_idle_exit();
return 1;
}