diff options
| author | Vladimir Davydov <vdavydov@parallels.com> | 2014-01-02 12:58:47 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 12:25:15 -0800 |
| commit | d2bdfb0f5b57578ade944a2b4c616f0cb06a9526 (patch) | |
| tree | b2c181e78d441eb0bab9a17b7b5ff5db36465f68 | |
| parent | 3d508835389d026df5a6cefa4209ee012abfb764 (diff) | |
| download | linux-stable-d2bdfb0f5b57578ade944a2b4c616f0cb06a9526.tar.gz linux-stable-d2bdfb0f5b57578ade944a2b4c616f0cb06a9526.tar.bz2 linux-stable-d2bdfb0f5b57578ade944a2b4c616f0cb06a9526.zip | |
memcg: fix memcg_size() calculation
commit 695c60830764945cf61a2cc623eb1392d137223e upstream.
The mem_cgroup structure contains nr_node_ids pointers to
mem_cgroup_per_node objects, not the objects themselves.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Glauber Costa <glommer@openvz.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 36cc2d0570ab..e0e979276df0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -337,7 +337,7 @@ struct mem_cgroup { static size_t memcg_size(void) { return sizeof(struct mem_cgroup) + - nr_node_ids * sizeof(struct mem_cgroup_per_node); + nr_node_ids * sizeof(struct mem_cgroup_per_node *); } /* internal only representation about the status of kmem accounting. */ |