Commit d7118175 authored Jun 06, 2012 by Paul E. McKenney Committed by Paul E. McKenney Jul 02, 2012

rcu: Fix rcu_is_cpu_idle() #ifdef in TINY_RCU

The rcu_is_cpu_idle() function is used if CONFIG_DEBUG_LOCK_ALLOC,
but TINY_RCU defines it only when CONFIG_PROVE_RCU. This causes
build failures when CONFIG_DEBUG_LOCK_ALLOC=y but CONFIG_PROVE_RCU=n.
This commit therefore adjusts the #ifdefs for rcu_is_cpu_idle() so
that it is defined when CONFIG_DEBUG_LOCK_ALLOC=y.

Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

parent 29154c57

kernel/rcutiny.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ void rcu_irq_enter(void)
		local_irq_restore(flags);
		}

		#ifdef CONFIG_PROVE_RCU
		#ifdef CONFIG_DEBUG_LOCK_ALLOC

		/*
		* Test whether RCU thinks that the current CPU is idle.
		@@ -183,7 +183,7 @@ int rcu_is_cpu_idle(void)
		}
		EXPORT_SYMBOL(rcu_is_cpu_idle);

		#endif /* #ifdef CONFIG_PROVE_RCU */
		#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */

		/*
		* Test whether the current CPU was interrupted from idle. Nested