Commit 822175e7 authored Oct 15, 2019 by Lai Jiangshan Committed by Paul E. McKenney Jan 24, 2020

rcu: Fix harmless omission of "CONFIG_" from #if condition



The C preprocessor macros SRCU and TINY_RCU should instead be CONFIG_SRCU
and CONFIG_TINY_RCU, respectively in the #f in kernel/rcu/rcu.h. But
there is no harm when "TINY_RCU" is wrongly used, which are always
non-defined, which makes "!defined(TINY_RCU)" always true, which means
the code block is always included, and the included code block doesn't
cause any compilation error so far in CONFIG_TINY_RCU builds.  It is
also the reason this change should not be taken in -stable.

This commit adds the needed "CONFIG_" prefix to both macros.

Not for -stable.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

parent c30fe541

kernel/rcu/rcu.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ void rcu_test_sync_prims(void);
		*/
		extern void resched_cpu(int cpu);

		#if defined(SRCU) \|\| !defined(TINY_RCU)
		#if defined(CONFIG_SRCU) \|\| !defined(CONFIG_TINY_RCU)

		#include <linux/rcu_node_tree.h>

		@@ -418,7 +418,7 @@ do { \
		#define raw_lockdep_assert_held_rcu_node(p) \
		lockdep_assert_held(&ACCESS_PRIVATE(p, lock))

		#endif /* #if defined(SRCU) \|\| !defined(TINY_RCU) */
		#endif /* #if defined(CONFIG_SRCU) \|\| !defined(CONFIG_TINY_RCU) */

		#ifdef CONFIG_SRCU
		void srcu_init(void);

Admin message