---

yaml --- r: 252267 b: refs/heads/master c: 12e6c41 h: refs/heads/master i: 252265: f415f08 252263: c3ef79f v: v3
git-mirror · May 26, 2011 · 9bf2f50 · 9bf2f50
1 parent edbc4b1
commit 9bf2f50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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);
 	}
 }