Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney: - Updates to use cond_resched() instead of cond_resched_rcu_qs() where feasible (currently everywhere except in kernel/rcu and in kernel/torture.c). Also a couple of fixes to avoid sending IPIs to offline CPUs. - Updates to simplify RCU's dyntick-idle handling. - Updates to remove almost all uses of smp_read_barrier_depends() and read_barrier_depends(). - Miscellaneous fixes. - Torture-test updates. Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -713,7 +713,6 @@ descend_to_keyring:
|
||||
* doesn't contain any keyring pointers.
|
||||
*/
|
||||
shortcut = assoc_array_ptr_to_shortcut(ptr);
|
||||
smp_read_barrier_depends();
|
||||
if ((shortcut->index_key[0] & ASSOC_ARRAY_FAN_MASK) != 0)
|
||||
goto not_this_keyring;
|
||||
|
||||
@@ -723,8 +722,6 @@ descend_to_keyring:
|
||||
}
|
||||
|
||||
node = assoc_array_ptr_to_node(ptr);
|
||||
smp_read_barrier_depends();
|
||||
|
||||
ptr = node->slots[0];
|
||||
if (!assoc_array_ptr_is_meta(ptr))
|
||||
goto begin_node;
|
||||
@@ -736,7 +733,6 @@ descend_to_node:
|
||||
kdebug("descend");
|
||||
if (assoc_array_ptr_is_shortcut(ptr)) {
|
||||
shortcut = assoc_array_ptr_to_shortcut(ptr);
|
||||
smp_read_barrier_depends();
|
||||
ptr = READ_ONCE(shortcut->next_node);
|
||||
BUG_ON(!assoc_array_ptr_is_node(ptr));
|
||||
}
|
||||
@@ -744,7 +740,6 @@ descend_to_node:
|
||||
|
||||
begin_node:
|
||||
kdebug("begin_node");
|
||||
smp_read_barrier_depends();
|
||||
slot = 0;
|
||||
ascend_to_node:
|
||||
/* Go through the slots in a node */
|
||||
@@ -792,14 +787,12 @@ ascend_to_node:
|
||||
|
||||
if (ptr && assoc_array_ptr_is_shortcut(ptr)) {
|
||||
shortcut = assoc_array_ptr_to_shortcut(ptr);
|
||||
smp_read_barrier_depends();
|
||||
ptr = READ_ONCE(shortcut->back_pointer);
|
||||
slot = shortcut->parent_slot;
|
||||
}
|
||||
if (!ptr)
|
||||
goto not_this_keyring;
|
||||
node = assoc_array_ptr_to_node(ptr);
|
||||
smp_read_barrier_depends();
|
||||
slot++;
|
||||
|
||||
/* If we've ascended to the root (zero backpointer), we must have just
|
||||
|
Reference in New Issue
Block a user