diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:43 +0100 |
| commit | ed9d23700ee7847c354c0edd6d4da358bad48b7d (patch) | |
| tree | c6f164f4d3808b80999927b49553e4dc9fa80598 /mm | |
| parent | 72bce45fdecab65936f1e466c5c5107e48f8251e (diff) | |
| parent | bf06bec1f8b088965577b14eecaf532fe3ca1f58 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
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 f96b49e4704e..4d6d836247dd 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]; } |