[kernel] r21744 - in dists/trunk/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Mon Aug 25 03:23:32 2014
New Revision: 21744

Log:
ftrace: Enable FUNCTION_TRACER, FUNCTION_GRAPH_TRACER, FTRACE_SYSCALLS, STACK_TRACER and DYNAMIC_FTRACE (Closes: #563847, #758469)

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Aug 24 21:27:25 2014	(r21743)
+++ dists/trunk/linux/debian/changelog	Mon Aug 25 03:23:32 2014	(r21744)
@@ -7,6 +7,8 @@
   * HID: Enable HID_RMI as module (Closes: #754519)
   * Set ABI to 1
   * [armhf,arm64] udeb: Add efi-modules
+  * ftrace: Enable FUNCTION_TRACER, FUNCTION_GRAPH_TRACER, FTRACE_SYSCALLS,
+    STACK_TRACER and DYNAMIC_FTRACE (Closes: #563847, #758469)
 
   [ Vagrant Cascadian ]
   * [armmp] Enable IMX_IPUV3_CORE (closes: #756810).

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Aug 24 21:27:25 2014	(r21743)
+++ dists/trunk/linux/debian/config/config	Mon Aug 25 03:23:32 2014	(r21744)
@@ -4580,6 +4580,7 @@
 ## file: fs/pstore/Kconfig
 ##
 # CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
 
 ##
@@ -4841,19 +4842,22 @@
 ## file: kernel/trace/Kconfig
 ##
 CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_FTRACE_SYSCALLS=y
 ## choice: Branch Profiling
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 ## end choice
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENT=y
 CONFIG_UPROBE_EVENT=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set