diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 17:06:53 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 20:18:25 -0700 |
commit | 5257a97a86766bdc3a976e3278b65367f35f9ff8 (patch) | |
tree | 4c2f54480001df75745bdfbf9b9f1ccbe71a3199 /mm | |
parent | ca43de58e5c35310fef81a64e0854615595935ee (diff) | |
parent | 410dbb746130bc052bb3c7a337a86252874adbdf (diff) |
Merge tag 'v3.10.12' into android-tegra-nv-3.10-rebase
This is the 3.10.12 stable release
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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]; } |