summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-10-23 15:33:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-23 16:00:21 +0200
commit07c4cc1cdaa08fcb6c0275dd7be49eae37260169 (patch)
treeaf29e7d9cfed3ea0b7d31c17ae5cde498ebdbf10
parentftrace: add ftrace warn on to disable ftrace (diff)
downloadlinux-07c4cc1cdaa08fcb6c0275dd7be49eae37260169.tar.xz
linux-07c4cc1cdaa08fcb6c0275dd7be49eae37260169.zip
ftrace: disable dynamic ftrace for all archs that use daemon
The ftrace daemon is complex and can cause nasty races if something goes wrong. Since it affects all of the kernel, this patch disables dynamic ftrace from any arch that depends on the daemon. Until the archs are ported over to the new MCOUNT_RECORD method, I am disabling dynamic ftrace from them. Note: I am leaving in the arch/<arch>/kernel/ftrace.c code alone since that can be used when the arch is ported to MCOUNT_RECORD. To port the arch to MCOUNT_RECORD, the scripts/recordmcount.pl needs to be updated. I will make that easier to do for 2.6.29. For 28, we will keep the archs disabled. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/sparc64/Kconfig1
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 600733426ae0..c5b431e231dd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,7 +17,6 @@ config ARM
select HAVE_KPROBES if (!XIP_KERNEL)
select HAVE_KRETPROBES if (HAVE_KPROBES)
select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
- select HAVE_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER)
select HAVE_GENERIC_DMA_COHERENT
help
The ARM series is a line of low-power-consumption RISC chip designs
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 441ce06174ff..5122a67e6ffa 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -111,7 +111,6 @@ config ARCH_NO_VIRT_TO_BUS
config PPC
bool
default y
- select HAVE_DYNAMIC_FTRACE
select HAVE_FUNCTION_TRACER
select ARCH_WANT_OPTIONAL_GPIOLIB
select HAVE_IDE
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 824f6122e1a5..3b96e70b4670 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,7 +11,6 @@ config SPARC
config SPARC64
bool
default y
- select HAVE_DYNAMIC_FTRACE
select HAVE_FUNCTION_TRACER
select HAVE_IDE
select HAVE_LMB