Merge branch 'linus' into locking/core, to resolve conflicts

[sfrench/cifs-2.6.git] / mm / slab.h

diff --git a/mm/slab.h b/mm/slab.h
index 028cdc7df67ec9e08a683ba27e64b17b19e7612e..86d7c7d860f92c3a46d505a4b327c76e34f5415a 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -259,7 +259,7 @@ cache_from_memcg_idx(struct kmem_cache *s, int idx)
         * memcg_caches issues a write barrier to match this (see
         * memcg_create_kmem_cache()).
         */
-       cachep = lockless_dereference(arr->entries[idx]);
+       cachep = READ_ONCE(arr->entries[idx]);
        rcu_read_unlock();
 
        return cachep;