From: Andreea-Cristina Bernat Date: Wed, 19 Mar 2014 09:18:31 +0000 (+0200) Subject: rcu: Merge rcu_sched_force_quiescent_state() with rcu_force_quiescent_state() X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~26^2^2~2^2~6 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a381d757d93f6e43063f74888676edd6216d0aff;p=pandora-kernel.git rcu: Merge rcu_sched_force_quiescent_state() with rcu_force_quiescent_state() This patch merges the function rcu_force_quiescent_state() with rcu_sched_force_quiescent_state(), using the rcu_state pointer. Firstly, the rcu_sched_force_quiescent_state() function is deleted from the file kernel/rcu/tree.c. Also, the rcu_force_quiescent_state() function that was calling force_quiescent_state with the argument rcu_preempt_state pointer was deleted as well. The new function that combines the old ones uses the rcu_state pointer and is located after rcu_batches_completed_bh() in kernel/rcu/tree.c. Signed-off-by: Andreea-Cristina Bernat Signed-off-by: Paul E. McKenney Reviewed-by: Josh Triplett --- Reading git-diff-tree failed