From ea0eb9843d4af6c63559d55b62a45befb6d4d6df Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Mon, 25 Aug 2014 06:41:10 +0000
Subject: [PATCH] [armel/kirkwood] ftrace: Disable some tracers to make the
 kernel image fit

svn path=/dists/trunk/linux/; revision=21745
---
 debian/changelog                    | 6 ++++--
 debian/config/armel/config.kirkwood | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df9942ff8..c649bbe60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ linux (3.16.1-1) UNRELEASED; urgency=medium
   * 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).
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 0fc35a160..3b56af441 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -611,6 +611,13 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 ##
 # 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
 ##