diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-10-23 06:26:23 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-10-23 06:26:23 -0400 |
| commit | 86f351191c060483f9c05f671429b0305840143b (patch) | |
| tree | a49f12372dc9bd87ffb3366b36442dd679bd734f /mm | |
| parent | 9c005c86b857097269b340be32eaddd4f195e192 (diff) | |
| parent | 2fb23fcb7c34e18aad058fb009221667366d1b9c (diff) | |
Merge tag 'v3.8.13.9' into v3.8-rt
v3.8.13.9
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 34a98d642196..3cdbd8f4cec5 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -153,6 +153,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]; } |