summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-16 18:27:13 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-16 18:27:13 +0100
commit2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e (patch)
treec0b3d4f14ae6dd98318d78fcf7d16f47954e06a4 /kernel
parentkernel/sysctl.c: Fix build failure with !CONFIG_PRINTK (diff)
parent[S390] kprobes: Fix the return address of multiple kretprobes (diff)
downloadlinux-2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e.tar.xz
linux-2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] kprobes: Fix the return address of multiple kretprobes [S390] kprobes: disable interrupts throughout [S390] ftrace: build without frame pointers on s390 [S390] mm: add devmem_is_allowed() for STRICT_DEVMEM checking [S390] vmlogrdr: purge after recording is switched off [S390] cio: fix incorrect ccw_device_init_count [S390] tape: add medium state notifications [S390] fix get_user_pages_fast
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index e04b8bcdef88..ea37e2ff4164 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -126,7 +126,7 @@ if FTRACE
config FUNCTION_TRACER
bool "Kernel Function Tracer"
depends on HAVE_FUNCTION_TRACER
- select FRAME_POINTER if (!ARM_UNWIND)
+ select FRAME_POINTER if !ARM_UNWIND && !S390
select KALLSYMS
select GENERIC_TRACER
select CONTEXT_SWITCH_TRACER