Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

[firefly-linux-kernel-4.4.55.git] / include / linux / radix-tree.h

diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index a916c6660dfa0ac94d9c08768b9b627470985247..355f6e80db0d3e8afd4de9d4bcf447ec4e637ea3 100644 (file)
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -136,7 +136,7 @@ do {                                                                        \
  */
 static inline void *radix_tree_deref_slot(void **pslot)
 {
-       void *ret = *pslot;
+       void *ret = rcu_dereference(*pslot);
        if (unlikely(radix_tree_is_indirect_ptr(ret)))
                ret = RADIX_TREE_RETRY;
        return ret;