sony: msm8974: update defconfigs
Change-Id: Ic865cca382108ae41dcd488330ea3ef0e393bef8
diff --git a/arch/arm/configs/cm_rhine_amami_row_defconfig b/arch/arm/configs/cm_rhine_amami_row_defconfig
index ee646f8e..6a7afc8 100644
--- a/arch/arm/configs/cm_rhine_amami_row_defconfig
+++ b/arch/arm/configs/cm_rhine_amami_row_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -95,6 +97,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_rhine_honami_row_defconfig b/arch/arm/configs/cm_rhine_honami_row_defconfig
index 861aaa0..9c6e268 100644
--- a/arch/arm/configs/cm_rhine_honami_row_defconfig
+++ b/arch/arm/configs/cm_rhine_honami_row_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -95,6 +97,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_rhine_togari_row_defconfig b/arch/arm/configs/cm_rhine_togari_row_defconfig
index 96c43f1..c1faebc 100644
--- a/arch/arm/configs/cm_rhine_togari_row_defconfig
+++ b/arch/arm/configs/cm_rhine_togari_row_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -95,6 +97,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_aries_defconfig b/arch/arm/configs/cm_shinano_aries_defconfig
index d99007a..6d2abb9 100644
--- a/arch/arm/configs/cm_shinano_aries_defconfig
+++ b/arch/arm/configs/cm_shinano_aries_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_castor_defconfig b/arch/arm/configs/cm_shinano_castor_defconfig
index 15b89d1..681ca34 100644
--- a/arch/arm/configs/cm_shinano_castor_defconfig
+++ b/arch/arm/configs/cm_shinano_castor_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_castor_windy_defconfig b/arch/arm/configs/cm_shinano_castor_windy_defconfig
index a4bcef4..a990d5f 100644
--- a/arch/arm/configs/cm_shinano_castor_windy_defconfig
+++ b/arch/arm/configs/cm_shinano_castor_windy_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_leo_defconfig b/arch/arm/configs/cm_shinano_leo_defconfig
index 051db26..71e257c 100644
--- a/arch/arm/configs/cm_shinano_leo_defconfig
+++ b/arch/arm/configs/cm_shinano_leo_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_scorpion_defconfig b/arch/arm/configs/cm_shinano_scorpion_defconfig
index 159b353..41988f5 100644
--- a/arch/arm/configs/cm_shinano_scorpion_defconfig
+++ b/arch/arm/configs/cm_shinano_scorpion_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_scorpion_windy_defconfig b/arch/arm/configs/cm_shinano_scorpion_windy_defconfig
index e443469..454163c 100644
--- a/arch/arm/configs/cm_shinano_scorpion_windy_defconfig
+++ b/arch/arm/configs/cm_shinano_scorpion_windy_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
diff --git a/arch/arm/configs/cm_shinano_sirius_defconfig b/arch/arm/configs/cm_shinano_sirius_defconfig
index 16cd934..adfa33b 100644
--- a/arch/arm/configs/cm_shinano_sirius_defconfig
+++ b/arch/arm/configs/cm_shinano_sirius_defconfig
@@ -14,6 +14,8 @@
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
@@ -102,6 +104,7 @@
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
CONFIG_COMPACTION=y
+CONFIG_KSM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y