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-- 9.2 KB
Makefile -rw-r--r-- 460 bytes
autosleep.c -rw-r--r-- 2.6 KB
block_io.c -rw-r--r-- 2.4 KB
console.c -rw-r--r-- 614 bytes
hibernate.c -rw-r--r-- 25.8 KB
main.c -rw-r--r-- 14.5 KB
power.h -rw-r--r-- 8.4 KB
poweroff.c -rw-r--r-- 980 bytes
process.c -rw-r--r-- 4.7 KB
qos.c -rw-r--r-- 14.5 KB
snapshot.c -rw-r--r-- 60.4 KB
suspend.c -rw-r--r-- 7.4 KB
suspend_test.c -rw-r--r-- 5.0 KB
swap.c -rw-r--r-- 35.8 KB
user.c -rw-r--r-- 9.7 KB
wakelock.c -rw-r--r-- 5.4 KB

back to top