Merge branch 'perf/urgent' into perf/core, to pick up fixes

[linux-2.6-microblaze.git] / kernel / trace / trace_uprobe.c

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index e3cbae7..2014f43 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -608,7 +608,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
 
        /* Don't print "0x  (null)" when offset is 0 */
        if (tu->offset) {
-               seq_printf(m, "0x%p", (void *)tu->offset);
+               seq_printf(m, "0x%px", (void *)tu->offset);
        } else {
                switch (sizeof(void *)) {
                case 4: