diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-09-29 15:38:55 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-09-29 15:38:55 -0400 |
commit | 73dddbb57bb08d465dd0ecab93db0c5209e50cfe (patch) | |
tree | 63f5adc345c08a15d42b9dff1d9d394ceddb1740 /kernel/trace/trace.h | |
parent | 8179e8a15b76eaec1e757da7a0f96de9f0c466c6 (diff) |
tracing: Only create stacktrace option when STACKTRACE is configured
Only create the stacktrace trace option when CONFIG_STACKTRACE is
configured.
Cleaned up the ftrace_trace_stack() function call a little to allow better
encapsulation of the stacktrace trace flag.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index b389d409b952..af34e1822dad 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -911,6 +911,13 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, | |||
911 | # define FUNCTION_DEFAULT_FLAGS 0UL | 911 | # define FUNCTION_DEFAULT_FLAGS 0UL |
912 | #endif | 912 | #endif |
913 | 913 | ||
914 | #ifdef CONFIG_STACKTRACE | ||
915 | # define STACK_FLAGS \ | ||
916 | C(STACKTRACE, "stacktrace"), | ||
917 | #else | ||
918 | # define STACK_FLAGS | ||
919 | #endif | ||
920 | |||
914 | /* | 921 | /* |
915 | * trace_iterator_flags is an enumeration that defines bit | 922 | * trace_iterator_flags is an enumeration that defines bit |
916 | * positions into trace_flags that controls the output. | 923 | * positions into trace_flags that controls the output. |
@@ -927,7 +934,6 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, | |||
927 | C(HEX, "hex"), \ | 934 | C(HEX, "hex"), \ |
928 | C(BIN, "bin"), \ | 935 | C(BIN, "bin"), \ |
929 | C(BLOCK, "block"), \ | 936 | C(BLOCK, "block"), \ |
930 | C(STACKTRACE, "stacktrace"), \ | ||
931 | C(PRINTK, "trace_printk"), \ | 937 | C(PRINTK, "trace_printk"), \ |
932 | C(ANNOTATE, "annotate"), \ | 938 | C(ANNOTATE, "annotate"), \ |
933 | C(USERSTACKTRACE, "userstacktrace"), \ | 939 | C(USERSTACKTRACE, "userstacktrace"), \ |
@@ -942,6 +948,7 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, | |||
942 | C(MARKERS, "markers"), \ | 948 | C(MARKERS, "markers"), \ |
943 | FUNCTION_FLAGS \ | 949 | FUNCTION_FLAGS \ |
944 | FGRAPH_FLAGS \ | 950 | FGRAPH_FLAGS \ |
951 | STACK_FLAGS \ | ||
945 | BRANCH_FLAGS | 952 | BRANCH_FLAGS |
946 | 953 | ||
947 | /* | 954 | /* |