diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 10:21:40 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 10:21:40 -0800 |
commit | 457d2ee225801441e96f2e35894ec404572ad862 (patch) | |
tree | c671e5a35103dc8a7d1ea4cdc0484bcc0e6f8e50 /kernel/trace/Kconfig | |
parent | da4a22cba7cb2d922691214aed6b1977f04efaff (diff) | |
parent | 818e3dd30a4ff34fff6d90e87ae59c73f6a53691 (diff) |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing, ring-buffer: add paranoid checks for loops
ftrace: use kretprobe trampoline name to test in output
tracing, alpha: undefined reference to `save_stack_trace'
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 b58f43bec36..33dbefd471e 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -25,7 +25,7 @@ config TRACING bool select DEBUG_FS select RING_BUFFER - select STACKTRACE + select STACKTRACE if STACKTRACE_SUPPORT select TRACEPOINTS select NOP_TRACER |