--- a/arch/arm/configs/aegis2_defconfig
+++ b/arch/arm/configs/aegis2_defconfig
@@ -517,7 +517,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -528,6 +527,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/aegis2_eng_defconfig
+++ b/arch/arm/configs/aegis2_eng_defconfig
@@ -525,6 +525,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/apexq_defconfig
+++ b/arch/arm/configs/apexq_defconfig
@@ -517,7 +517,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -528,6 +527,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/apexq_eng_defconfig
+++ b/arch/arm/configs/apexq_eng_defconfig
@@ -525,6 +525,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/apexq_rev02_defconfig
+++ b/arch/arm/configs/apexq_rev02_defconfig
@@ -523,7 +523,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -534,6 +533,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/apexq_rev02_eng_defconfig
+++ b/arch/arm/configs/apexq_rev02_eng_defconfig
@@ -531,6 +531,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/comanche_defconfig
+++ b/arch/arm/configs/comanche_defconfig
@@ -517,7 +517,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -528,6 +527,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/comanche_eng_defconfig
+++ b/arch/arm/configs/comanche_eng_defconfig
@@ -525,6 +525,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/comanche_rev02_defconfig
+++ b/arch/arm/configs/comanche_rev02_defconfig
@@ -518,7 +518,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -529,6 +528,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/comanche_rev02_eng_defconfig
+++ b/arch/arm/configs/comanche_rev02_eng_defconfig
@@ -526,6 +526,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/espresso10_att_defconfig
+++ b/arch/arm/configs/espresso10_att_defconfig
@@ -521,7 +521,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -532,6 +531,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/espresso10_att_eng_defconfig
+++ b/arch/arm/configs/espresso10_att_eng_defconfig
@@ -529,6 +529,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/espresso10_spr_defconfig
+++ b/arch/arm/configs/espresso10_spr_defconfig
@@ -521,7 +521,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -532,6 +531,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/espresso10_spr_eng_defconfig
+++ b/arch/arm/configs/espresso10_spr_eng_defconfig
@@ -529,6 +529,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/espresso10_vzw_defconfig
+++ b/arch/arm/configs/espresso10_vzw_defconfig
@@ -522,7 +522,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -533,6 +532,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/espresso10_vzw_eng_defconfig
+++ b/arch/arm/configs/espresso10_vzw_eng_defconfig
@@ -530,6 +530,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/espresso_vzw_defconfig
+++ b/arch/arm/configs/espresso_vzw_defconfig
@@ -520,7 +520,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -531,6 +530,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/espresso_vzw_eng_defconfig
+++ b/arch/arm/configs/espresso_vzw_eng_defconfig
@@ -528,6 +528,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/express_defconfig
+++ b/arch/arm/configs/express_defconfig
@@ -522,7 +522,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -533,6 +532,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/express_eng_defconfig
+++ b/arch/arm/configs/express_eng_defconfig
@@ -530,6 +530,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/express_rev03_defconfig
+++ b/arch/arm/configs/express_rev03_defconfig
@@ -520,7 +520,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -531,6 +530,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/express_rev03_eng_defconfig
+++ b/arch/arm/configs/express_rev03_eng_defconfig
@@ -528,6 +528,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/gogh_defconfig
+++ b/arch/arm/configs/gogh_defconfig
@@ -517,7 +517,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -528,6 +527,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/gogh_eng_defconfig
+++ b/arch/arm/configs/gogh_eng_defconfig
@@ -525,6 +525,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/infinite_defconfig
+++ b/arch/arm/configs/infinite_defconfig
@@ -515,7 +515,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -526,6 +525,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/infinite_eng_defconfig
+++ b/arch/arm/configs/infinite_eng_defconfig
@@ -523,6 +523,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/jasper_defconfig
+++ b/arch/arm/configs/jasper_defconfig
@@ -515,7 +515,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -526,6 +525,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/jasper_eng_defconfig
+++ b/arch/arm/configs/jasper_eng_defconfig
@@ -523,6 +523,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/m2_att_defconfig
+++ b/arch/arm/configs/m2_att_defconfig
@@ -529,7 +529,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -540,6 +539,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/m2_att_eng_defconfig
+++ b/arch/arm/configs/m2_att_eng_defconfig
@@ -537,6 +537,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/m2_cric_defconfig
+++ b/arch/arm/configs/m2_cric_defconfig
@@ -531,7 +531,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -542,6 +541,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/m2_cric_eng_defconfig
+++ b/arch/arm/configs/m2_cric_eng_defconfig
@@ -539,6 +539,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/m2_mpcs_defconfig
+++ b/arch/arm/configs/m2_mpcs_defconfig
@@ -531,7 +531,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -542,6 +541,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/m2_mpcs_eng_defconfig
+++ b/arch/arm/configs/m2_mpcs_eng_defconfig
@@ -539,6 +539,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/m2_spr_defconfig
+++ b/arch/arm/configs/m2_spr_defconfig
@@ -530,7 +530,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -541,6 +540,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/m2_spr_eng_defconfig
+++ b/arch/arm/configs/m2_spr_eng_defconfig
@@ -538,6 +538,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/m2_uscc_defconfig
+++ b/arch/arm/configs/m2_uscc_defconfig
@@ -531,7 +531,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -542,6 +541,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/m2_uscc_eng_defconfig
+++ b/arch/arm/configs/m2_uscc_eng_defconfig
@@ -539,6 +539,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/configs/m2_vzw_defconfig
+++ b/arch/arm/configs/m2_vzw_defconfig
@@ -530,7 +530,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_DEBUG_FS=y
-# CONFIG_FTRACE is not set
# CONFIG_BINARY_PRINTF is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_TIMER_STATS=y
@@ -541,6 +540,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_ENABLE_DEFAULT_TRACERS=y
# CONFIG_DYNAMIC_DEBUG is not set
--- a/arch/arm/configs/m2_vzw_eng_defconfig
+++ b/arch/arm/configs/m2_vzw_eng_defconfig
@@ -538,6 +538,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_SCHED_TRACER=y
CONFIG_FAULT_INJECTION=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
--- a/arch/arm/mach-msm/board-8960-camera.c
+++ b/arch/arm/mach-msm/board-8960-camera.c
@@ -106,7 +106,11 @@ static struct gpiomux_setting cam_settin
},
{
.func = GPIOMUX_FUNC_1, /* drive strength for D2*/
+#if defined(CONFIG_MACH_M2_VZW)
+ .drv = GPIOMUX_DRV_2MA,
+#else
.drv = GPIOMUX_DRV_4MA,
+#endif
.pull = GPIOMUX_PULL_NONE,
},
{
--- a/arch/arm/mach-msm/qdsp5v2/snddev_icodec.c
+++ b/arch/arm/mach-msm/qdsp5v2/snddev_icodec.c
@@ -1143,10 +1143,10 @@ static int __init snddev_icodec_init(voi
debugfs_sdev_dent = debugfs_create_dir("snddev_icodec", 0);
if (debugfs_sdev_dent) {
debugfs_afelb = debugfs_create_file("afe_loopback",
- S_IFREG | S_IWUGO, debugfs_sdev_dent,
+ S_IFREG | S_IWUSR | S_IWGRP, debugfs_sdev_dent,
(void *) "afe_loopback", &snddev_icodec_debug_fops);
debugfs_adielb = debugfs_create_file("adie_loopback",
- S_IFREG | S_IWUGO, debugfs_sdev_dent,
+ S_IFREG | S_IWUSR | S_IWGRP, debugfs_sdev_dent,
(void *) "adie_loopback", &snddev_icodec_debug_fops);
}
#endif
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -1794,10 +1794,10 @@ dhd_rx_frame(dhd_pub_t *dhdp, int ifidx,
*/
((athost_wl_status_info_t*)dhdp->wlfc_state)->stats.wlfc_header_only_pkt++;
#ifdef CUSTOMER_HW4
- if (numpkt == 1 && pkt_free && (free_ptr == pktbuf)) {
+ /*if (numpkt == 1 && pkt_free && (free_ptr == pktbuf)) {
DHD_ERROR(("DHD TRACE2(FREE):%d %d %p\n",
pkt_free, caller, free_ptr));
- }
+ }*/
#endif
PKTFREE(dhdp->osh, pktbuf, TRUE);
continue;
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -1311,7 +1311,7 @@ static void usb_debugfs_init(struct gs_p
return;
debugfs_create_file("readstatus", 0444, dent, ui_dev, &debug_adb_ops);
- debugfs_create_file("reset", 0222, dent, ui_dev, &debug_rst_ops);
+ debugfs_create_file("reset", 0220, dent, ui_dev, &debug_rst_ops);
}
#else
static void usb_debugfs_init(struct gs_port *ui_dev) {}
--- a/sound/soc/msm/qdsp6/q6afe.c
+++ b/sound/soc/msm/qdsp6/q6afe.c
@@ -1530,14 +1530,14 @@ static int __init afe_init(void)
this_afe.apr = NULL;
#ifdef CONFIG_DEBUG_FS
debugfs_afelb = debugfs_create_file("afe_loopback",
- S_IFREG | S_IWUGO, NULL, (void *) "afe_loopback",
+ S_IFREG | S_IWUSR | S_IWGRP, NULL, (void *) "afe_loopback",
&afe_debug_fops);
if (IS_ERR(debugfs_afelb))
return PTR_ERR(debugfs_afelb);
debugfs_afelb_gain = debugfs_create_file("afe_loopback_gain",
- S_IFREG | S_IWUGO, NULL, (void *) "afe_loopback_gain",
+ S_IFREG | S_IWUSR | S_IWGRP, NULL, (void *) "afe_loopback_gain",
&afe_debug_fops);
--- a/sound/soc/msm/qdsp6/q6asm.c
+++ b/sound/soc/msm/qdsp6/q6asm.c
@@ -3292,13 +3292,13 @@ static int __init q6asm_init(void)
#ifdef CONFIG_DEBUG_FS
out_buffer = kmalloc(OUT_BUFFER_SIZE, GFP_KERNEL);
out_dentry = debugfs_create_file("audio_out_latency_measurement_node",\
- S_IFREG | S_IRUGO | S_IWUGO,\
+ S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP,\
NULL, NULL, &audio_output_latency_debug_fops);
if (IS_ERR(out_dentry))
pr_err("debugfs_create_file failed\n");
in_buffer = kmalloc(IN_BUFFER_SIZE, GFP_KERNEL);
in_dentry = debugfs_create_file("audio_in_latency_measurement_node",\
- S_IFREG | S_IRUGO | S_IWUGO,\
+ S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP,\
NULL, NULL, &audio_input_latency_debug_fops);
if (IS_ERR(in_dentry))
pr_err("debugfs_create_file failed\n");