Merge tag 'v3.10.63' into update

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

diff --git a/mm/slab.h b/mm/slab.h
index f96b49e4704efb1d362ef10c6eacef81afb9e6a0..4d6d836247dd95c3eb5e4d3e39295a80eb000a81 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -162,6 +162,8 @@ static inline const char *cache_name(struct kmem_cache *s)
 
 static inline struct kmem_cache *cache_from_memcg(struct kmem_cache *s, int idx)
 {
+       if (!s->memcg_params)
+               return NULL;
        return s->memcg_params->memcg_caches[idx];
 }