Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab74fdfd authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Handle obsolete references to TINY_PREEMPT_RCU 



Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
parent f27bc487

include/linux/rcupdate.h

+8 −9
Original line number Original line Diff line number Diff line
@@ -826,15 +826,14 @@ static inline void rcu_preempt_sleep_check(void) 
 * read-side critical section that would block in a !PREEMPT kernel.

 * read-side critical section that would block in a !PREEMPT kernel.

 * But if you want the full story, read on!

 * But if you want the full story, read on!

 *

 *

 * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), it

 * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU),

 * is illegal to block while in an RCU read-side critical section.  In

 * it is illegal to block while in an RCU read-side critical section.

 * preemptible RCU implementations (TREE_PREEMPT_RCU and TINY_PREEMPT_RCU)

 * In preemptible RCU implementations (TREE_PREEMPT_RCU) in CONFIG_PREEMPT

 * in CONFIG_PREEMPT kernel builds, RCU read-side critical sections may

 * kernel builds, RCU read-side critical sections may be preempted,

 * be preempted, but explicit blocking is illegal.  Finally, in preemptible

 * but explicit blocking is illegal.  Finally, in preemptible RCU

 * RCU implementations in real-time (with -rt patchset) kernel builds,

 * implementations in real-time (with -rt patchset) kernel builds, RCU

 * RCU read-side critical sections may be preempted and they may also

 * read-side critical sections may be preempted and they may also block, but

 * block, but only when acquiring spinlocks that are subject to priority

 * only when acquiring spinlocks that are subject to priority inheritance.

 * inheritance.

 */

 */

static inline void rcu_read_lock(void)

static inline void rcu_read_lock(void)

{

{

init/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -505,7 +505,7 @@ config PREEMPT_RCU 
	def_bool TREE_PREEMPT_RCU

	def_bool TREE_PREEMPT_RCU

	help

	help

	  This option enables preemptible-RCU code that is common between

	  This option enables preemptible-RCU code that is common between

	  the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations.

	  TREE_PREEMPT_RCU and, in the old days, TINY_PREEMPT_RCU.





config RCU_STALL_COMMON

config RCU_STALL_COMMON

	def_bool ( TREE_RCU || TREE_PREEMPT_RCU || RCU_TRACE )

	def_bool ( TREE_RCU || TREE_PREEMPT_RCU || RCU_TRACE )