From 9bf2f5027499d42756ca83dc26d47a15f64d0953 Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Thu, 26 May 2011 04:57:53 +0000
Subject: [PATCH] --- yaml --- r: 252267 b: refs/heads/master c:
 12e6c419b48c4d1803918e5d952ebee07bae7465 h: refs/heads/master i:   252265:
 f415f08eb3ab8976d2ee35195d4f8bb58a0ae03d   252263:
 c3ef79f081d2d64480934ce47e7182f1d0c0f9ff v: v3

---
 [refs]               | 2 +-
 trunk/net/can/proc.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b553a74d8eb4..2abc653bb092 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0daf9d58f6b3342d07c5f6bbfb304dbe5db4ec
+refs/heads/master: 12e6c419b48c4d1803918e5d952ebee07bae7465
diff --git a/trunk/net/can/proc.c b/trunk/net/can/proc.c
index f4265cc9c3fb..0016f7339699 100644
--- a/trunk/net/can/proc.c
+++ b/trunk/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);
 	}
 }