diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2011-05-26 04:57:53 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-26 14:23:35 -0400 |
| commit | 12e6c419b48c4d1803918e5d952ebee07bae7465 (patch) | |
| tree | 71da9cb1b692433460c380a9eb049e9f8821d359 | |
| parent | fd0daf9d58f6b3342d07c5f6bbfb304dbe5db4ec (diff) | |
| download | linux-3.10-12e6c419b48c4d1803918e5d952ebee07bae7465.tar.gz linux-3.10-12e6c419b48c4d1803918e5d952ebee07bae7465.tar.bz2 linux-3.10-12e6c419b48c4d1803918e5d952ebee07bae7465.zip | |
can: convert to %pK for kptr_restrict support
As these pointers have been printed without using %p they were missed in the
big network kptr_restrict conversion patch %p -> %pK from Dan Rosenberg.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/can/proc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/can/proc.c b/net/can/proc.c index f4265cc9c3f..0016f733969 100644 --- a/net/can/proc.c +++ b/net/can/proc.c @@ -204,12 +204,11 @@ static void can_print_rcvlist(struct seq_file *m, struct hlist_head *rx_list, hlist_for_each_entry_rcu(r, n, rx_list, list) { char *fmt = (r->can_id & CAN_EFF_FLAG)? - " %-5s %08X %08x %08x %08x %8ld %s\n" : - " %-5s %03X %08x %08lx %08lx %8ld %s\n"; + " %-5s %08x %08x %pK %pK %8ld %s\n" : + " %-5s %03x %08x %pK %pK %8ld %s\n"; seq_printf(m, fmt, DNAME(dev), r->can_id, r->mask, - (unsigned long)r->func, (unsigned long)r->data, - r->matches, r->ident); + r->func, r->data, r->matches, r->ident); } } |