diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-15 23:04:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-15 23:04:00 +0200 |
| commit | 37cae5e24981f4619372e6a29456d34e4cbdc5e2 (patch) | |
| tree | d234d751ccb5f46a2632aa9ccffbd0cdbad31941 /kernel | |
| parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | rcu/idle: Wrap cpu-idle poll mode within rcu_idle_enter/exit (diff) | |
| download | linux-37cae5e24981f4619372e6a29456d34e4cbdc5e2.tar.xz linux-37cae5e24981f4619372e6a29456d34e4cbdc5e2.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
- Two fixlets for the fallout of the generic idle task conversion
- Documentation update
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
rcu/idle: Wrap cpu-idle poll mode within rcu_idle_enter/exit
idle: Fix hlt/nohlt command-line handling in new generic idle
kthread: Document ways of reducing OS jitter due to per-CPU kthreads
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu/idle.c | 2 |
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; } |