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

[Ben Hutchings]

Author: benh
Date: Mon Aug 25 06:41:10 2014
New Revision: 21745

Log:
[armel/kirkwood] ftrace: Disable some tracers to make the kernel image fit

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armel/config.kirkwood

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Aug 25 03:23:32 2014	(r21744)
+++ dists/trunk/linux/debian/changelog	Mon Aug 25 06:41:10 2014	(r21745)
@@ -7,8 +7,10 @@
   * 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)
+  * ftrace: Enable more tracers (Closes: #563847, #758469):
+    - Enable FUNCTION_TRACER and DYNAMIC_FTRACE
+    - Enable FUNCTION_GRAPH_TRACER, FTRACE_SYSCALLS and STACK_TRACER 
+      (except on armel/kirkwood)
 
   [ Vagrant Cascadian ]
   * [armmp] Enable IMX_IPUV3_CORE (closes: #756810).

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Mon Aug 25 03:23:32 2014	(r21744)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Mon Aug 25 06:41:10 2014	(r21745)
@@ -612,6 +612,13 @@
 # CONFIG_SUSPEND is not set
 
 ##
+## file: kernel/trace/Kconfig
+##
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_STACK_TRACER is not set
+
+##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model