tools lib traceevent: fix pointer-integer size mismatch
authorMark Rutland <mark.rutland@arm.com>
Wed, 15 Jan 2014 10:44:07 +0000 (10:44 +0000)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 15 Jan 2014 20:04:38 +0000 (17:04 -0300)
The scsi and cfg80211 plugins cast between unsigned long long and
pointers, which is problematic for architectures where unsigned long
long is wider than the native pointer size:

  linux/tools/lib/traceevent/plugin_scsi.c: In function ‘process_scsi_trace_parse_cdb’:
  linux/tools/lib/traceevent/plugin_scsi.c:408:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
    scsi_trace_parse_cdb(s, (unsigned char *) args[1], args[2]);

  linux/tools/lib/traceevent/plugin_cfg80211.c: In function ‘process___le16_to_cpup’:
  linux/tools/lib/traceevent/plugin_cfg80211.c:11:18: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
    uint16_t *val = (uint16_t *) args[0];

This patch adds an intermediate cast to unsigned long, silencing the
warning.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Link: http://lkml.kernel.org/r/1389782648-4417-3-git-send-email-mark.rutland@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/plugin_cfg80211.c
tools/lib/traceevent/plugin_scsi.c

index dcab8e873c2150b571a32e2dc765a350814efcc2..57e98221db20e3dff9b19415665d580949a7f9ae 100644 (file)
@@ -8,7 +8,7 @@ static unsigned long long
 process___le16_to_cpup(struct trace_seq *s,
                       unsigned long long *args)
 {
-       uint16_t *val = (uint16_t *) args[0];
+       uint16_t *val = (uint16_t *) (unsigned long) args[0];
        return val ? (long long) le16toh(*val) : 0;
 }
 
index 6fb8e3e3fcad2dcf649800ef21c44b05a0d06b07..7ef16cc96562ffb47ff7d3df9947371f5f8e1603 100644 (file)
@@ -405,7 +405,7 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,
                                                unsigned long long *args)
 {
-       scsi_trace_parse_cdb(s, (unsigned char *) args[1], args[2]);
+       scsi_trace_parse_cdb(s, (unsigned char *) (unsigned long) args[1], args[2]);
        return 0;
 }