diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 12:49:59 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 12:49:59 -0700 |
| commit | 252997330908cb8ee3d5714539ed967b977c2eae (patch) | |
| tree | 627395514c622dc6eb51ae3a2a5bbebddc788299 /kernel/rcutiny.c | |
| parent | 25e03a74e4a14e0d52a66fb56c728f049a6a26d3 (diff) | |
| parent | 5c173eb8bcb9c1aa888bd6d14a4cb746f3dd2420 (diff) | |
| download | op-kernel-dev-252997330908cb8ee3d5714539ed967b977c2eae.zip op-kernel-dev-252997330908cb8ee3d5714539ed967b977c2eae.tar.gz | |
Merge branch 'idle.2013.09.25a' into HEAD
idle.2013.09.25a: Topic branch for idle entry-/exit-related changes.
Diffstat (limited to 'kernel/rcutiny.c')
| -rw-r--r-- | kernel/rcutiny.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c index 7e3b0d6..312e9709 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c @@ -176,18 +176,18 @@ void rcu_irq_enter(void) } EXPORT_SYMBOL_GPL(rcu_irq_enter); -#ifdef CONFIG_DEBUG_LOCK_ALLOC +#if defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE) /* * Test whether RCU thinks that the current CPU is idle. */ -int rcu_is_cpu_idle(void) +bool __rcu_is_watching(void) { - return !rcu_dynticks_nesting; + return rcu_dynticks_nesting; } -EXPORT_SYMBOL(rcu_is_cpu_idle); +EXPORT_SYMBOL(__rcu_is_watching); -#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */ +#endif /* defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_RCU_TRACE) */ /* * Test whether the current CPU was interrupted from idle. Nested |
