|
@@ -2226,19 +2226,23 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
|
|
|
const char *sym, int offset, char *modname, struct kprobe *pp)
|
|
|
{
|
|
|
char *kprobe_type;
|
|
|
+ void *addr = p->addr;
|
|
|
|
|
|
if (p->pre_handler == pre_handler_kretprobe)
|
|
|
kprobe_type = "r";
|
|
|
else
|
|
|
kprobe_type = "k";
|
|
|
|
|
|
+ if (!kallsyms_show_value())
|
|
|
+ addr = NULL;
|
|
|
+
|
|
|
if (sym)
|
|
|
- seq_printf(pi, "%p %s %s+0x%x %s ",
|
|
|
- p->addr, kprobe_type, sym, offset,
|
|
|
+ seq_printf(pi, "%px %s %s+0x%x %s ",
|
|
|
+ addr, kprobe_type, sym, offset,
|
|
|
(modname ? modname : " "));
|
|
|
- else
|
|
|
- seq_printf(pi, "%p %s %p ",
|
|
|
- p->addr, kprobe_type, p->addr);
|
|
|
+ else /* try to use %pS */
|
|
|
+ seq_printf(pi, "%px %s %pS ",
|
|
|
+ addr, kprobe_type, p->addr);
|
|
|
|
|
|
if (!pp)
|
|
|
pp = p;
|