Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 0fdd6c1e1f82cf84dc909872e5b6ee3368dee7e4..54c0876b43d554e4e1d8981e08007a8a3cd0c59a 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4277,7 +4277,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
                        int node;
                        struct page *page;
 
-                       page = ACCESS_ONCE(c->page);
+                       page = READ_ONCE(c->page);
                        if (!page)
                                continue;
 
@@ -4292,7 +4292,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
                        total += x;
                        nodes[node] += x;
 
-                       page = ACCESS_ONCE(c->partial);
+                       page = READ_ONCE(c->partial);
                        if (page) {
                                node = page_to_nid(page);
                                if (flags & SO_TOTAL)