summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2011-01-13 23:47:39 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 01:32:50 (GMT)
commitf3e8eb70b1807d1b30aa6972af0cf30077c40112 (patch)
tree5b541e4850fa6a9922b288e9efd7c632021657f6 /init
parentdbd4ea78f002df283c95d9774837041735fa1bf9 (diff)
downloadlinux-fsl-qoriq-f3e8eb70b1807d1b30aa6972af0cf30077c40112.tar.xz
memcg: fix unit mismatch in memcg oom limit calculation
Adding the number of swap pages to the byte limit of a memory control group makes no sense. Convert the pages to bytes before adding them. The only user of this code is the OOM killer, and the way it is used means that the error results in a higher OOM badness value. Since the cgroup limit is the same for all tasks in the cgroup, the error should have no practical impact at the moment. But let's not wait for future or changing users to trip over it. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Greg Thelen <gthelen@google.com> Cc: David Rientjes <rientjes@google.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions