diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2008-10-23 09:33:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-23 10:00:21 -0400 |
| commit | 07c4cc1cdaa08fcb6c0275dd7be49eae37260169 (patch) | |
| tree | af29e7d9cfed3ea0b7d31c17ae5cde498ebdbf10 /arch | |
| parent | 6912896e994ddaf06cc0f6d3f2098bc4b59bdd84 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sparc64/Kconfig | 1 |
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 | |||
| 17 | select HAVE_KPROBES if (!XIP_KERNEL) | 17 | select HAVE_KPROBES if (!XIP_KERNEL) |
| 18 | select HAVE_KRETPROBES if (HAVE_KPROBES) | 18 | select HAVE_KRETPROBES if (HAVE_KPROBES) |
| 19 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) | 19 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) |
| 20 | select HAVE_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER) | ||
| 21 | select HAVE_GENERIC_DMA_COHERENT | 20 | select HAVE_GENERIC_DMA_COHERENT |
| 22 | help | 21 | help |
| 23 | The ARM series is a line of low-power-consumption RISC chip designs | 22 | 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 | |||
| 111 | config PPC | 111 | config PPC |
| 112 | bool | 112 | bool |
| 113 | default y | 113 | default y |
| 114 | select HAVE_DYNAMIC_FTRACE | ||
| 115 | select HAVE_FUNCTION_TRACER | 114 | select HAVE_FUNCTION_TRACER |
| 116 | select ARCH_WANT_OPTIONAL_GPIOLIB | 115 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 117 | select HAVE_IDE | 116 | 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 | |||
| 11 | config SPARC64 | 11 | config SPARC64 |
| 12 | bool | 12 | bool |
| 13 | default y | 13 | default y |
| 14 | select HAVE_DYNAMIC_FTRACE | ||
| 15 | select HAVE_FUNCTION_TRACER | 14 | select HAVE_FUNCTION_TRACER |
| 16 | select HAVE_IDE | 15 | select HAVE_IDE |
| 17 | select HAVE_LMB | 16 | select HAVE_LMB |