Revision c255a458055e459f65eb7b7f51dc5dbdd0caf1d8 authored by Andrew Morton on 31 July 2012, 23:43:02 UTC, committed by Linus Torvalds on 01 August 2012, 01:42:43 UTC
Sanity:

CONFIG_CGROUP_MEM_RES_CTLR -> CONFIG_MEMCG
CONFIG_CGROUP_MEM_RES_CTLR_SWAP -> CONFIG_MEMCG_SWAP
CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED -> CONFIG_MEMCG_SWAP_ENABLED
CONFIG_CGROUP_MEM_RES_CTLR_KMEM -> CONFIG_MEMCG_KMEM

[mhocko@suse.cz: fix missed bits]
Cc: Glauber Costa <glommer@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 8093451
History
File Mode Size
Kconfig -rw-r--r-- 8.9 KB
Makefile -rw-r--r-- 620 bytes
acorn.c -rw-r--r-- 12.3 KB
acorn.h -rw-r--r-- 488 bytes
amiga.c -rw-r--r-- 3.6 KB
amiga.h -rw-r--r-- 89 bytes
atari.c -rw-r--r-- 3.9 KB
atari.h -rw-r--r-- 1.0 KB
check.c -rw-r--r-- 3.7 KB
check.h -rw-r--r-- 1.1 KB
efi.c -rw-r--r-- 20.7 KB
efi.h -rw-r--r-- 4.3 KB
ibm.c -rw-r--r-- 6.8 KB
ibm.h -rw-r--r-- 47 bytes
karma.c -rw-r--r-- 1.1 KB
karma.h -rw-r--r-- 124 bytes
ldm.c -rw-r--r-- 44.1 KB
ldm.h -rw-r--r-- 5.4 KB
mac.c -rw-r--r-- 3.3 KB
mac.h -rw-r--r-- 1.2 KB
msdos.c -rw-r--r-- 15.2 KB
msdos.h -rw-r--r-- 124 bytes
osf.c -rw-r--r-- 1.9 KB
osf.h -rw-r--r-- 123 bytes
sgi.c -rw-r--r-- 2.2 KB
sgi.h -rw-r--r-- 128 bytes
sun.c -rw-r--r-- 3.7 KB
sun.h -rw-r--r-- 169 bytes
sysv68.c -rw-r--r-- 1.9 KB
sysv68.h -rw-r--r-- 62 bytes
ultrix.c -rw-r--r-- 1.2 KB
ultrix.h -rw-r--r-- 90 bytes

back to top