]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
perf callchains: Fix unw_word_t pointer casts
authorRabin Vincent <rabin.vincent@axis.com>
Sun, 27 Sep 2015 18:37:55 +0000 (20:37 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 13 Oct 2015 02:27:40 +0000 (23:27 -0300)
unw_word_t is uint64_t even on 32-bit MIPS.  Cast it to uintptr_t before
the cast to void *p to get rid of the following errors:

  util/unwind-libunwind.c: In function 'access_mem':
  util/unwind-libunwind.c:464:4: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
  util/unwind-libunwind.c:475:2: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
  cc1: all warnings being treated as errors
  make[3]: *** [util/unwind-libunwind.o] Error 1

Signed-off-by: Rabin Vincent <rabin.vincent@axis.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rabin Vincent <rabinv@axis.com>
Link: http://lkml.kernel.org/r/1443379079-29133-1-git-send-email-rabin.vincent@axis.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/unwind-libunwind.c

index ea993f6c7e0c6cf2bacde37cc868f565501d4713..f729f9e99f9979bc5802deb8a57136277c7f6e7c 100644 (file)
@@ -463,7 +463,7 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
                if (ret) {
                        pr_debug("unwind: access_mem %p not inside range"
                                 " 0x%" PRIx64 "-0x%" PRIx64 "\n",
-                                (void *) addr, start, end);
+                                (void *) (uintptr_t) addr, start, end);
                        *valp = 0;
                        return ret;
                }
@@ -473,7 +473,7 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
        offset = addr - start;
        *valp  = *(unw_word_t *)&stack->data[offset];
        pr_debug("unwind: access_mem addr %p val %lx, offset %d\n",
-                (void *) addr, (unsigned long)*valp, offset);
+                (void *) (uintptr_t) addr, (unsigned long)*valp, offset);
        return 0;
 }