[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-87abb3b15c62033409f5bf2ffb5620c94f91cf2c@git.kernel.org>
Date: Tue, 21 Aug 2012 08:18:00 -0700
From: tip-bot for Wang Tianhong <wangthbj@...ux.vnet.ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
rostedt@...dmis.org, wangthbj@...ux.vnet.ibm.com,
tglx@...utronix.de
Subject: [tip:perf/core] tracing/trivial: Fix some typos in kernel/trace
Commit-ID: 87abb3b15c62033409f5bf2ffb5620c94f91cf2c
Gitweb: http://git.kernel.org/tip/87abb3b15c62033409f5bf2ffb5620c94f91cf2c
Author: Wang Tianhong <wangthbj@...ux.vnet.ibm.com>
AuthorDate: Thu, 2 Aug 2012 14:02:00 +0800
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Tue, 7 Aug 2012 09:43:32 -0400
tracing/trivial: Fix some typos in kernel/trace
Fix some typos in kernel/trace.
Link: http://lkml.kernel.org/r/1343887320.2228.9.camel@louis-ThinkPad-T410
Signed-off-by: Wang Tianhong <wangthbj@...ux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/ring_buffer.c | 4 ++--
kernel/trace/trace.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 49491fa..b32ed0e 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2816,7 +2816,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_record_enable);
* to the buffer after this will fail and return NULL.
*
* This is different than ring_buffer_record_disable() as
- * it works like an on/off switch, where as the disable() verison
+ * it works like an on/off switch, where as the disable() version
* must be paired with a enable().
*/
void ring_buffer_record_off(struct ring_buffer *buffer)
@@ -2839,7 +2839,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_record_off);
* ring_buffer_record_off().
*
* This is different than ring_buffer_record_enable() as
- * it works like an on/off switch, where as the enable() verison
+ * it works like an on/off switch, where as the enable() version
* must be paired with a disable().
*/
void ring_buffer_record_on(struct ring_buffer *buffer)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a120f98..d1a8d07 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -426,15 +426,15 @@ __setup("trace_buf_size=", set_buf_size);
static int __init set_tracing_thresh(char *str)
{
- unsigned long threshhold;
+ unsigned long threshold;
int ret;
if (!str)
return 0;
- ret = strict_strtoul(str, 0, &threshhold);
+ ret = strict_strtoul(str, 0, &threshold);
if (ret < 0)
return 0;
- tracing_thresh = threshhold * 1000;
+ tracing_thresh = threshold * 1000;
return 1;
}
__setup("tracing_thresh=", set_tracing_thresh);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists