diff options
| author | Ingo Molnar | 2011-05-12 09:36:18 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2011-05-12 09:36:18 +0200 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /kernel/trace/Kconfig | |
| parent | sched: Shorten the construction of the span cpu mask of sched domain (diff) | |
| parent | Linux 2.6.39-rc7 (diff) | |
| download | kernel-qcow2-linux-9cb5baba5e3acba0994ad899ee908799104c9965.tar.gz kernel-qcow2-linux-9cb5baba5e3acba0994ad899ee908799104c9965.tar.xz kernel-qcow2-linux-9cb5baba5e3acba0994ad899ee908799104c9965.zip | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'kernel/trace/Kconfig')
| -rw-r--r-- | kernel/trace/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 61d7d59f4a1a..2ad39e556cb4 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -141,7 +141,7 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" depends on HAVE_FUNCTION_TRACER - select FRAME_POINTER if !ARM_UNWIND && !S390 + select FRAME_POINTER if !ARM_UNWIND && !S390 && !MICROBLAZE select KALLSYMS select GENERIC_TRACER select CONTEXT_SWITCH_TRACER |