can: convert to %pK for kptr_restrict support

hartkopp · davem330 · commit 12e6c419b48c · 2011-05-26T14:23:35.000-04:00
As these pointers have been printed without using %p they were missed in the
big network kptr_restrict conversion patch %p -&gt; %pK from Dan Rosenberg.

Signed-off-by: Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,11 @@ static void can_print_rcvlist(struct seq_file m, struct hlist_head rx_list,`
`204`	`204`
`205`	`205`	`hlist_for_each_entry_rcu(r, n, rx_list, list) {`
`206`	`206`	`char *fmt = (r->can_id & CAN_EFF_FLAG)?`
`207`		`- " %-5s %08X %08x %08x %08x %8ld %s\n" :`
`208`		`- " %-5s %03X %08x %08lx %08lx %8ld %s\n";`
	`207`	`+ " %-5s %08x %08x %pK %pK %8ld %s\n" :`
	`208`	`+ " %-5s %03x %08x %pK %pK %8ld %s\n";`
`209`	`209`
`210`	`210`	`seq_printf(m, fmt, DNAME(dev), r->can_id, r->mask,`
`211`		`- (unsigned long)r->func, (unsigned long)r->data,`
`212`		`- r->matches, r->ident);`
	`211`	`+ r->func, r->data, r->matches, r->ident);`
`213`	`212`	`}`
`214`	`213`	`}`
`215`	`214`