diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:29 +0100 |
| commit | bf06bec1f8b088965577b14eecaf532fe3ca1f58 (patch) | |
| tree | 68717606745d17d6dff26c849d3db0cd1490d3b1 /mm | |
| parent | 965abff8d8accdffc4af1b11fcf580e83031330a (diff) | |
| parent | 85cdabba08d484bdcc4b25f0bbc23ac60c75aa5b (diff) | |
Merge tag 'v3.10.11' into linux-linaro-lsk
This is the 3.10.11 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/slab.h b/mm/slab.h index f96b49e4704..4d6d836247d 100644 --- 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]; } |