From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 28 Oct 2015 08:34:00 +0000 (+0800)
Subject: ARM: rockchip: rockchip_defconfig enable UID_CPUTIME
X-Git-Tag: firefly_0821_release~3666
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dd52f9d0762bb764c3e5026301e9f52b29903adb;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: rockchip_defconfig enable UID_CPUTIME

Change-Id: Ifb92e539e868ed15561ae8698b226422fae5fee8
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 85117afe630c..b3545b119b54 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -28,9 +28,9 @@ CONFIG_PANIC_TIMEOUT=5
 # CONFIG_UID16 is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
+CONFIG_PROFILING=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -220,6 +220,7 @@ CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
+CONFIG_UID_CPUTIME=y
 CONFIG_MPU_SENSORS_TIMERIRQ=y
 CONFIG_INV_SENSORS=y
 CONFIG_MPU_SENSORS_MPU6050B1=y