[linux-yocto] [PATCH 2/3] mips: have the mips BSPs disable function tracing instead of ftrace

[Tom Zanussi]

The problem the mips machines apparently ran into was due to
CONFIG_FUNCTION_TRACER et al - no need to disable all of the tracing
infrastructure (CONFIG_FTRACE) to disable that.

Also, the ftrace-disable feature they were using disabled
CONFIG_DEBUG_KERNEL too, which is just a switch to allow other options
to be enabled but doesn't enable anything on itself, so no need for
that either.

Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/mti-malta32/mti-malta32.scc           | 4 ++--
 meta/cfg/kernel-cache/bsp/mti-malta64/mti-malta64.scc           | 4 ++--
 meta/cfg/kernel-cache/bsp/routerstationpro/routerstationpro.scc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/mti-malta32/mti-malta32.scc b/meta/cfg/kernel-cache/bsp/mti-malta32/mti-malta32.scc
index 1dce16b..c9e2eb6 100644
--- a/meta/cfg/kernel-cache/bsp/mti-malta32/mti-malta32.scc
+++ b/meta/cfg/kernel-cache/bsp/mti-malta32/mti-malta32.scc
@@ -8,5 +8,5 @@ patch mti_malta32-fix-the-pci-resource-conflicts.patch
 patch mousedev-mousedev-patch-for-qemumips.patch
 # merged to mainline: patch 0001-MIPS-Fix-build-errors-in-sc-mips.c.patch
 
-# v3.8+ kernels have broken mips dynamic ftrace, disable it completely for now
-include features/ftrace/ftrace-disable.scc
+# v3.8+ kernels have broken mips ftrace function tracing, disable it for now
+include features/ftrace/ftrace-function-tracer-disable.scc
diff --git a/meta/cfg/kernel-cache/bsp/mti-malta64/mti-malta64.scc b/meta/cfg/kernel-cache/bsp/mti-malta64/mti-malta64.scc
index adab8d2..e73cf4c 100644
--- a/meta/cfg/kernel-cache/bsp/mti-malta64/mti-malta64.scc
+++ b/meta/cfg/kernel-cache/bsp/mti-malta64/mti-malta64.scc
@@ -11,5 +11,5 @@ patch bsp/mti-malta32/mousedev-mousedev-patch-for-qemumips.patch
 patch 0001-oprofile-mips-override-register-writes-for-qemu-mips.patch
 patch oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch
 
-# v3.8+ kernels have broken mips dynamic ftrace, disable it completely for now
-include features/ftrace/ftrace-disable.scc
+# v3.8+ kernels have broken mips ftrace function tracing, disable it for now
+include features/ftrace/ftrace-function-tracer-disable.scc
diff --git a/meta/cfg/kernel-cache/bsp/routerstationpro/routerstationpro.scc b/meta/cfg/kernel-cache/bsp/routerstationpro/routerstationpro.scc
index 04e96d6..07e9a8f 100644
--- a/meta/cfg/kernel-cache/bsp/routerstationpro/routerstationpro.scc
+++ b/meta/cfg/kernel-cache/bsp/routerstationpro/routerstationpro.scc
@@ -1,8 +1,8 @@
 kconf hardware routerstationpro.cfg
 kconf hardware watchdog.cfg
 
-# v3.8+ kernels have broken mips dynamic ftrace, disable it completely for now
-include features/ftrace/ftrace-disable.scc
+# v3.8+ kernels have broken mips ftrace function tracing, disable it for now
+include features/ftrace/ftrace-function-tracer-disable.scc
 
 include cfg/usb-mass-storage.scc
 include cfg/fs/vfat.scc
-- 
1.7.11.4