Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 12e6c419b48c4d1803918e5d952ebee07bae7465

Authored by Oliver Hartkopp
Committed by David S. Miller
1 parent fd0daf9d58
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

... ... @@ -204,12 +204,11 @@
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