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

Commit 8375ad98 authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Linus Torvalds
Browse files

vm: adjust ifdef for TINY_RCU 



There is an ifdef in page_cache_get_speculative() that checks for !SMP
and TREE_RCU, which has been an impossible combination since the advent
of TINY_RCU.  The ifdef enables a fastpath that is valid when preemption
is disabled by rcu_read_lock() in UP systems, which is the case when
TINY_RCU is enabled.  This commit therefore adjusts the ifdef to
generate the fastpath when TINY_RCU is enabled.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reported-by: default avatarAndi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 250297ed

include/linux/pagemap.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static inline int page_cache_get_speculative(struct page *page) 
{

	VM_BUG_ON(in_interrupt());



#if !defined(CONFIG_SMP) && defined(CONFIG_TREE_RCU)

#ifdef CONFIG_TINY_RCU

# ifdef CONFIG_PREEMPT_COUNT

	VM_BUG_ON(!in_atomic());

# endif