From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
LKML <linux-kernel@vger.kernel.org>,
"K.Prasad" <prasad@linux.vnet.ibm.com>
Subject: [PATCH 13/13] ksym_tracer: Fix compile warnings
Date: Mon, 07 Dec 2009 15:45:02 +0800 [thread overview]
Message-ID: <4B1CB27E.4000709@cn.fujitsu.com> (raw)
In-Reply-To: <4B1CB14A.4080402@cn.fujitsu.com>
Fix these 2 warnings:
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
kernel/trace/trace_ksym.c: In function 'ksym_trace_filter_write':
kernel/trace/trace_ksym.c:295: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace_ksym.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index acb87d4..e393146 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -236,7 +236,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)
@@ -278,7 +279,7 @@ static ssize_t ksym_trace_filter_write(struct file *file,
{
struct trace_ksym *entry;
struct hlist_node *node;
- char *input_string, *ksymname = NULL;
+ char *input_string, *buf, *ksymname = NULL;
unsigned long ksym_addr = 0;
int ret, op, changed = 0;
@@ -292,7 +293,7 @@ static ssize_t ksym_trace_filter_write(struct file *file,
}
input_string[count] = '\0';
- strstrip(input_string);
+ buf = strstrip(input_string);
/*
* Clear all breakpoints if:
@@ -300,14 +301,14 @@ 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();
kfree(input_string);
return count;
}
- ret = op = parse_ksym_trace_str(input_string, &ksymname, &ksym_addr);
+ ret = op = parse_ksym_trace_str(buf, &ksymname, &ksym_addr);
if (ret < 0) {
kfree(input_string);
return ret;
--
1.6.3
next prev parent reply other threads:[~2009-12-07 7:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-07 7:39 [PATCH 0/13] tracing: various cleanups and small fixes Li Zefan
2009-12-07 7:40 ` [PATCH 01/13] tracing: Extract duplicate ftrace_raw_init_event_foo() Li Zefan
2009-12-07 14:27 ` Frederic Weisbecker
2009-12-08 0:54 ` Li Zefan
2009-12-07 7:40 ` [PATCH 02/13] tracing: Extract calls to trace_define_common_fields() Li Zefan
2009-12-07 20:39 ` Frederic Weisbecker
2009-12-07 7:40 ` [PATCH 03/13] tracing: Move a printk out of ftrace_raw_reg_event_foo() Li Zefan
2009-12-07 21:32 ` Frederic Weisbecker
2009-12-08 1:00 ` Li Zefan
2009-12-07 7:41 ` [PATCH 04/13] ftrace: Return EINVAL when writing invalid val to set_ftrace_filter Li Zefan
2009-12-07 7:41 ` [PATCH 05/13] ftrace: Call trace_parser_clear() properly Li Zefan
2009-12-07 7:41 ` [PATCH 06/13] function-graph: Allow writing the same val to set_graph_function Li Zefan
2009-12-07 14:43 ` Frederic Weisbecker
2009-12-07 7:42 ` [PATCH 07/13] tracing: Use seq file for trace_options Li Zefan
2009-12-07 7:42 ` [PATCH 08/13] tracing: Use seq file for trace_clock Li Zefan
2009-12-07 7:42 ` [PATCH 09/13] tracing: Remove useless trace option Li Zefan
2009-12-07 7:43 ` [PATCH 10/13] tracing: Simplify trace_option_write() Li Zefan
2009-12-07 7:43 ` [PATCH 11/13] tracing: Change event->profile_count to be int type Li Zefan
2009-12-07 7:44 ` [PATCH 12/13] tracing/power: Remove two exports Li Zefan
2009-12-07 15:02 ` Arjan van de Ven
2009-12-07 7:45 ` Li Zefan [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-12-08 3:13 [PATCH 00/13] tracing: various cleanups and small fixes (updated) Li Zefan
2009-12-08 3:18 ` [PATCH 13/13] ksym_tracer: Fix compile warnings Li Zefan
2009-12-13 13:08 [GIT PULL] tracing updates Frederic Weisbecker
2009-12-13 13:08 ` [PATCH 13/13] ksym_tracer: Fix compile warnings Frederic Weisbecker
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=4B1CB27E.4000709@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=prasad@linux.vnet.ibm.com \
--cc=rostedt@goodmis.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