summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Vorobiov <s.vorobiov@samsung.com>2013-09-16 18:05:34 +0400
committerStanislav Vorobiov <s.vorobiov@samsung.com>2013-09-16 18:05:34 +0400
commit558947279a00868e179a5222419bcd2a0860ed80 (patch)
treee2f0c7490192ec7dd496aa521c8b98cec48f6e2b
parentb7ed68f26df6ae4af1ad533549806aecb8d7e0e8 (diff)
downloademulator-kernel-558947279a00868e179a5222419bcd2a0860ed80.tar.gz
emulator-kernel-558947279a00868e179a5222419bcd2a0860ed80.tar.bz2
emulator-kernel-558947279a00868e179a5222419bcd2a0860ed80.zip
memcg: add to config
Tizen IVI requires memory cgroups for proper functioning
-rw-r--r--arch/x86/configs/i386_tizen_emul_defconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/configs/i386_tizen_emul_defconfig b/arch/x86/configs/i386_tizen_emul_defconfig
index 0f9b2ec167eb..28cc562d2d97 100644
--- a/arch/x86/configs/i386_tizen_emul_defconfig
+++ b/arch/x86/configs/i386_tizen_emul_defconfig
@@ -113,7 +113,10 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
@@ -128,6 +131,7 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y