diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-04-27 10:31:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-27 10:31:29 +0200 |
| commit | 6c8a7213278324f381cbcbf51510711ed745d8e6 (patch) | |
| tree | 1b83e24917d58dcf4af6d6b4d8c26ce012cff43c /kernel | |
| parent | perf events, x86: Work around the Nehalem AAJ80 erratum (diff) | |
| parent | ftrace: Build without frame pointers on Microblaze (diff) | |
| download | linux-dev-6c8a7213278324f381cbcbf51510711ed745d8e6.tar.xz linux-dev-6c8a7213278324f381cbcbf51510711ed745d8e6.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel')
| -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 |