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-- 15.0 KB
Makefile -rw-r--r-- 2.1 KB
blktrace.c -rw-r--r-- 41.9 KB
ftrace.c -rw-r--r-- 100.1 KB
power-traces.c -rw-r--r-- 418 bytes
ring_buffer.c -rw-r--r-- 112.2 KB
ring_buffer_benchmark.c -rw-r--r-- 10.5 KB
rpm-traces.c -rw-r--r-- 474 bytes
trace.c -rw-r--r-- 117.5 KB
trace.h -rw-r--r-- 24.5 KB
trace_branch.c -rw-r--r-- 9.1 KB
trace_clock.c -rw-r--r-- 3.0 KB
trace_entries.h -rw-r--r-- 7.2 KB
trace_event_perf.c -rw-r--r-- 7.8 KB
trace_events.c -rw-r--r-- 37.2 KB
trace_events_filter.c -rw-r--r-- 50.9 KB
trace_events_filter_test.h -rw-r--r-- 1.0 KB
trace_export.c -rw-r--r-- 5.3 KB
trace_functions.c -rw-r--r-- 8.7 KB
trace_functions_graph.c -rw-r--r-- 34.9 KB
trace_irqsoff.c -rw-r--r-- 15.5 KB
trace_kdb.c -rw-r--r-- 3.0 KB
trace_kprobe.c -rw-r--r-- 31.3 KB
trace_mmiotrace.c -rw-r--r-- 9.0 KB
trace_nop.c -rw-r--r-- 2.2 KB
trace_output.c -rw-r--r-- 27.8 KB
trace_output.h -rw-r--r-- 1.6 KB
trace_printk.c -rw-r--r-- 7.6 KB
trace_probe.c -rw-r--r-- 20.3 KB
trace_probe.h -rw-r--r-- 4.6 KB
trace_sched_switch.c -rw-r--r-- 5.8 KB
trace_sched_wakeup.c -rw-r--r-- 14.0 KB
trace_selftest.c -rw-r--r-- 20.3 KB
trace_selftest_dynamic.c -rw-r--r-- 168 bytes
trace_stack.c -rw-r--r-- 8.3 KB
trace_stat.c -rw-r--r-- 8.2 KB
trace_stat.h -rw-r--r-- 973 bytes
trace_syscalls.c -rw-r--r-- 16.9 KB
trace_uprobe.c -rw-r--r-- 17.7 KB

back to top