Merge tag 'v3.10.66' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 8ccd296c6d9c7586fca85fc89bfd9f7a4023e220..bd88411595b9ba1df48332a7e89d64847cd7de6e 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -565,7 +565,7 @@ static void init_node_lock_keys(int q)
        if (slab_state < UP)
                return;
 
-       for (i = 1; i < PAGE_SHIFT + MAX_ORDER; i++) {
+       for (i = 1; i <= KMALLOC_SHIFT_HIGH; i++) {
                struct kmem_cache_node *n;
                struct kmem_cache *cache = kmalloc_caches[i];