mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Li Zefan <lizf@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	fweisbec@gmail.com, rostedt@goodmis.org, lizf@cn.fujitsu.com,
	tglx@linutronix.de, prasad@linux.vnet.ibm.com
Subject: [tip:tracing/urgent] ksym_tracer: Fix bad cast
Date: Mon, 14 Dec 2009 09:48:30 GMT	[thread overview]
Message-ID: <tip-16620e0f1990fa6d896a639449c4b3d678458464@git.kernel.org> (raw)
In-Reply-To: <4B1DC578.9020909@cn.fujitsu.com>

Commit-ID:  16620e0f1990fa6d896a639449c4b3d678458464
Gitweb:     http://git.kernel.org/tip/16620e0f1990fa6d896a639449c4b3d678458464
Author:     Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Tue, 8 Dec 2009 11:18:16 +0800
Committer:  Frederic Weisbecker <fweisbec@gmail.com>
CommitDate: Sun, 13 Dec 2009 18:46:54 +0100

ksym_tracer: Fix bad cast

Fix this warning:

kernel/trace/trace_ksym.c: In function 'ksym_trace_filter_read':
kernel/trace/trace_ksym.c:239: warning: cast to pointer from integer of different size

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: "K.Prasad" <prasad@linux.vnet.ibm.com>
LKML-Reference: <4B1DC578.9020909@cn.fujitsu.com>
[remove the strstrip fix as tglx already fixed that]
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
 kernel/trace/trace_ksym.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index 64e7a5b..48f1c6c 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -235,7 +235,8 @@ static ssize_t ksym_trace_filter_read(struct file *filp, char __user *ubuf,
 	mutex_lock(&ksym_tracer_mutex);
 
 	hlist_for_each_entry(entry, node, &ksym_filter_head, ksym_hlist) {
-		ret = trace_seq_printf(s, "%pS:", (void *)entry->attr.bp_addr);
+		ret = trace_seq_printf(s, "%pS:",
+				(void *)(unsigned long)entry->attr.bp_addr);
 		if (entry->attr.bp_type == HW_BREAKPOINT_R)
 			ret = trace_seq_puts(s, "r--\n");
 		else if (entry->attr.bp_type == HW_BREAKPOINT_W)
@@ -298,8 +299,8 @@ static ssize_t ksym_trace_filter_write(struct file *file,
 	 * 2: echo 0 > ksym_trace_filter
 	 * 3: echo "*:---" > ksym_trace_filter
 	 */
-	if (!input_string[0] || !strcmp(input_string, "0") ||
-	    !strcmp(input_string, "*:---")) {
+	if (!buf[0] || !strcmp(buf, "0") ||
+	    !strcmp(buf, "*:---")) {
 		__ksym_trace_reset();
 		ret = 0;
 		goto out;

  reply	other threads:[~2009-12-14  9:49 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-08  3:13 [PATCH 00/13] tracing: various cleanups and small fixes (updated) Li Zefan
2009-12-08  3:14 ` [PATCH 01/13] tracing: Extract duplicate ftrace_raw_init_event_foo() Li Zefan
2009-12-08  7:30   ` Frederic Weisbecker
2009-12-08  7:49     ` Li Zefan
2009-12-08  8:08       ` Frederic Weisbecker
2009-12-08 13:23       ` Steven Rostedt
2009-12-14  9:45   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:14 ` [PATCH 02/13] tracing: Extract calls to trace_define_common_fields() Li Zefan
2009-12-08  5:36   ` Lai Jiangshan
2009-12-08  7:57     ` Frederic Weisbecker
2009-12-08  8:03       ` Li Zefan
2009-12-08  8:16         ` Frederic Weisbecker
2009-12-08  8:21           ` Li Zefan
2009-12-08  8:59             ` Frederic Weisbecker
2009-12-14  9:45   ` [tip:tracing/urgent] tracing: Pull up " tip-bot for Li Zefan
2009-12-08  3:14 ` [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo() Li Zefan
2009-12-08  7:43   ` Frederic Weisbecker
2009-12-08  7:49     ` Li Zefan
2009-12-08  8:11       ` Frederic Weisbecker
2009-12-14  9:46   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:15 ` [PATCH 04/13] ftrace: Return EINVAL when writing invalid val to set_ftrace_filter Li Zefan
2009-12-14  9:46   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:15 ` [PATCH 05/13] ftrace: Call trace_parser_clear() properly Li Zefan
2009-12-08  9:48   ` Frederic Weisbecker
2009-12-08 10:03     ` Li Zefan
2009-12-08 11:43       ` Frederic Weisbecker
2009-12-08 13:28       ` Steven Rostedt
2009-12-09  5:52   ` Steven Rostedt
2009-12-14  9:46   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:15 ` [PATCH 06/13] function-graph: Allow writing the same val to set_graph_function Li Zefan
2009-12-14  9:46   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:15 ` [PATCH 07/13] tracing: Use seq file for trace_options Li Zefan
2009-12-14  9:47   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:16 ` [PATCH 08/13] tracing: Use seq file for trace_clock Li Zefan
2009-12-14  9:47   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:16 ` [PATCH 09/13] tracing: Remove useless trace option Li Zefan
2009-12-14  9:47   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:17 ` [PATCH 10/13] tracing: Simplify trace_option_write() Li Zefan
2009-12-14  9:47   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:17 ` [PATCH 11/13] tracing: Change event->profile_count to be int type Li Zefan
2009-12-14  9:48   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:17 ` [PATCH 12/13] tracing/power: Remove two exports Li Zefan
2009-12-14  9:48   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-12-08  3:18 ` [PATCH 13/13] ksym_tracer: Fix compile warnings Li Zefan
2009-12-14  9:48   ` tip-bot for Li Zefan [this message]
2009-12-08 12:23 ` [PATCH 00/13] tracing: various cleanups and small fixes (updated) Frederic Weisbecker
2009-12-08 13:29   ` Steven Rostedt
2009-12-08 13:41     ` Frederic Weisbecker
2009-12-09  5:53 ` 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=tip-16620e0f1990fa6d896a639449c4b3d678458464@git.kernel.org \
    --to=lizf@cn.fujitsu.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=prasad@linux.vnet.ibm.com \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /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

Powered by JetHome