The patch titled Subject: vm: adjust ifdef for TINY_RCU has been added to the -mm tree. Its filename is vm-adjust-ifdef-for-tiny_rcu.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx> Subject: 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: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> Reported-by: Andi Kleen <andi@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pagemap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/pagemap.h~vm-adjust-ifdef-for-tiny_rcu include/linux/pagemap.h --- a/include/linux/pagemap.h~vm-adjust-ifdef-for-tiny_rcu +++ a/include/linux/pagemap.h @@ -149,7 +149,7 @@ static inline int page_cache_get_specula { 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 _ Patches currently in -mm which might be from paulmck@xxxxxxxxxxxxxxxxxx are revert-parts-of-hlist-drop-the-node-parameter-from-iterators.patch mkcapflagspl-convert-to-mkcapflagssh.patch headers_installpl-convert-to-headers_installsh.patch vm-adjust-ifdef-for-tiny_rcu.patch procfs-improve-scaling-in-proc.patch procfs-improve-scaling-in-proc-v5.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html