]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
memcg: disable move charge in no mmu case
authorDaisuke Nishimura <d-nishimura@mtf.biglobe.ne.jp>
Tue, 23 Mar 2010 20:35:11 +0000 (13:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Mar 2010 23:31:19 +0000 (16:31 -0700)
commit5cfb80a73b5a52fb19d8b0611203e4dd58e8e9a2
treebb4db72652827235f1e548c6c9db1a04406c26ad
parentae6be51ed01d6c4aaf249a207b4434bc7785853b
memcg: disable move charge in no mmu case

In commit 02491447 ("memcg: move charges of anonymous swap"), I tried to
disable move charge feature in no mmu case by enclosing all the related
functions with "#ifdef CONFIG_MMU", but the commit places these ifdefs in
wrong place.  (it seems that it's mangled while handling some fixes...)

This patch fixes it up.

Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.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>
mm/memcontrol.c