1 files changed, 13 insertions, 4 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 3b83957b6439..c6bd28edd533 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3121,7 +3121,7 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups)
                 ssize_t size = memcg_caches_array_size(num_groups);
 
                 size *= sizeof(void *);
-                size += sizeof(struct memcg_cache_params);
+                size += offsetof(struct memcg_cache_params, memcg_caches);
 
                 s->memcg_params = kzalloc(size, GFP_KERNEL);
                 if (!s->memcg_params) {
@@ -3164,13 +3164,16 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups)
 int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
                          struct kmem_cache *root_cache)
 {
-        size_t size = sizeof(struct memcg_cache_params);
+        size_t size;
 
         if (!memcg_kmem_enabled())
                 return 0;
 
-        if (!memcg)
+        if (!memcg) {
+                size = offsetof(struct memcg_cache_params, memcg_caches);
                 size += memcg_limited_groups_array_size * sizeof(void *);
+        } else
+                size = sizeof(struct memcg_cache_params);
 
         s->memcg_params = kzalloc(size, GFP_KERNEL);
         if (!s->memcg_params)
@@ -5588,7 +5591,13 @@ static int compare_thresholds(const void *a, const void *b)
         const struct mem_cgroup_threshold *_a = a;
         const struct mem_cgroup_threshold *_b = b;
 
-        return _a->threshold - _b->threshold;
+        if (_a->threshold > _b->threshold)
+                return 1;
+
+        if (_a->threshold < _b->threshold)
+                return -1;
+
+        return 0;
 }
 
 static int mem_cgroup_oom_notify_cb(struct mem_cgroup *memcg)