net: convert %p usage to %pK

[socketcan-devel.git] / kernel / 2.6 / net / can / proc.c

diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c
index 752f496676c79e72f40e5d5a6d57955fb18ea561..9c785c01d63e38981398e5fba3b5cae09044c76e 100644 (file)
--- a/kernel/2.6/net/can/proc.c
+++ b/kernel/2.6/net/can/proc.c
@@ -212,12 +212,16 @@ 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";
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+                       "   %-5s  %08x  %08x  %p  %p  %8ld  %s\n" :
+                       "   %-5s     %03x    %08x  %p  %p  %8ld  %s\n";
+#else
+                       "   %-5s  %08x  %08x  %pK  %pK  %8ld  %s\n" :
+                       "   %-5s     %03x    %08x  %pK  %pK  %8ld  %s\n";
+#endif
 
                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);
        }
 }