summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Jain <ajain@motorola.com>2014-05-20 02:08:16 -0500
committerAmit Jain <ajain@motorola.com>2014-05-20 19:05:30 +0000
commit7489b569ffb64cdb998544405b6774bd43aab70b (patch)
tree60e1054593464060ef4163c5ac47bbe9cf7b18c8
parent50df95d6a584153418007d558a1e2483ddc93d30 (diff)
downloadolio-linux-3.10-7489b569ffb64cdb998544405b6774bd43aab70b.tar.xz
olio-linux-3.10-7489b569ffb64cdb998544405b6774bd43aab70b.zip
IKXCLOCK-1469: Disable Kernel Same Page Merging
This feature was enabled to support 128 MB devices. Since the product decision is to ship a 256 MB device, CPU cycles can be saved by preventing this daemon from running periodically. Change-Id: Icfd73616fda5f40a84b499ea681c93b5b7ef7420
-rw-r--r--arch/arm/configs/minnow_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/minnow_defconfig b/arch/arm/configs/minnow_defconfig
index 5e9ed960a72..58feb8f94d7 100644
--- a/arch/arm/configs/minnow_defconfig
+++ b/arch/arm/configs/minnow_defconfig
@@ -438,7 +438,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
-CONFIG_KSM=y
+# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_NEED_PER_CPU_KM=y