From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 25 Aug 2014 08:13:17 +0000 (+0800)
Subject: ARM: rockchip: rockchip_defconfig: enable zram
X-Git-Tag: firefly_0821_release~4805
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80d3321ab4921952dd2bfaed1d255da04775cff9;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: rockchip_defconfig: enable zram
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
old mode 100755
new mode 100644
index 37a01f79f16b..0198855c7ff3
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -11,6 +11,8 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_NAMESPACES=y
@@ -509,6 +511,8 @@ CONFIG_RTC_HYM8563=y
 CONFIG_RK808_RTC=y
 CONFIG_RTC_DRV_RC5T619=y
 CONFIG_STAGING=y
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y