From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
"zhangwei(Jovi)" <jovi.zhangwei@huawei.com>
Subject: [for-next-3.11][PATCH 01/12] tracing: Use correct config guard CONFIG_STACK_TRACER
Date: Fri, 19 Jul 2013 10:12:25 -0400 [thread overview]
Message-ID: <20130719141448.406433972@goodmis.org> (raw)
In-Reply-To: 20130719141224.703522101@goodmis.org
[-- Attachment #1: 0001-tracing-Use-correct-config-guard-CONFIG_STACK_TRACER.patch --]
[-- Type: text/plain, Size: 1260 bytes --]
From: "zhangwei(Jovi)" <jovi.zhangwei@huawei.com>
We should use CONFIG_STACK_TRACER to guard readme text
of stack tracer related file, not CONFIG_STACKTRACE.
Link: http://lkml.kernel.org/r/51E3B3A2.8080609@huawei.com
Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0cd500b..25b91af 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3537,14 +3537,14 @@ static const char readme_msg[] =
"\n snapshot\t\t- Like 'trace' but shows the content of the static snapshot buffer\n"
"\t\t\t Read the contents for more information\n"
#endif
-#ifdef CONFIG_STACKTRACE
+#ifdef CONFIG_STACK_TRACER
" stack_trace\t\t- Shows the max stack trace when active\n"
" stack_max_size\t- Shows current max stack size that was traced\n"
"\t\t\t Write into this file to reset the max size (trigger a new trace)\n"
#ifdef CONFIG_DYNAMIC_FTRACE
" stack_trace_filter\t- Like set_ftrace_filter but limits what stack_trace traces\n"
#endif
-#endif /* CONFIG_STACKTRACE */
+#endif /* CONFIG_STACK_TRACER */
;
static ssize_t
--
1.7.10.4
next prev parent reply other threads:[~2013-07-19 14:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-19 14:12 [for-next-3.11][PATCH 00/12] tracing: Cleanups and fixes Steven Rostedt
2013-07-19 14:12 ` Steven Rostedt [this message]
2013-07-19 14:12 ` [for-next-3.11][PATCH 02/12] tracing: Use trace_seq_puts()/trace_seq_putc() where possible Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 03/12] tracing: Typo fix on ring buffer comments Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 04/12] tracing/function: Avoid perf_trace_buf_*() if event_function.perf_events is empty Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 05/12] tracing/syscall: Avoid perf_trace_buf_*() if sys_data->perf_events " Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 06/12] tracing/perf: Move the PERF_MAX_TRACE_SIZE check into perf_trace_buf_prepare() Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 07/12] tracing/kprobe: Wait for disabling all running kprobe handlers Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 08/12] tracing: Fix error handling to ensure instances can always be removed Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 09/12] tracing: Miscellaneous fixes for trace_array ref counting Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 10/12] tracing: Add ref_data to function and fgraph tracer structs Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 11/12] tracing: Simplify the iteration logic in f_start/f_next Steven Rostedt
2013-07-19 14:12 ` [for-next-3.11][PATCH 12/12] tracing: Do not (ab)use trace_seq in event_id_read() Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130719141448.406433972@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=jovi.zhangwei@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox