diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-02-17 11:39:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-02-17 11:39:28 +0100 |
| commit | 7057bb975dab827997e0ca9dd92cafef0856b0cc (patch) | |
| tree | 7784dc59c03f25b6bc4fa5cc12d5b61cb8b53765 /kernel/trace/trace_uprobe.c | |
| parent | 33ea4b24277b06dbc55d7f5772a46f029600255e (diff) | |
| parent | 297f9233b53a08fd457815e19f1d6f2c3389857b (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_uprobe.c')
| -rw-r--r-- | kernel/trace/trace_uprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index e3cbae702a53..2014f4351ae0 100644 --- 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: |