diff --git a/[refs] b/[refs] index e8adf9d53e7e..a754bd53a98a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 274a517ec13b3b47047b97a2e7c912138c9806e0 +refs/heads/master: 9e0064a5456fd75fd7c70f6f3692c7f732f91a65 diff --git a/trunk/net/phonet/socket.c b/trunk/net/phonet/socket.c index 6bf6e3c97d5c..aca8fba099e9 100644 --- a/trunk/net/phonet/socket.c +++ b/trunk/net/phonet/socket.c @@ -723,7 +723,8 @@ static int pn_res_seq_show(struct seq_file *seq, void *v) struct sock *sk = *psk; seq_printf(seq, "%02X %5d %lu%n", - psk - pnres.sk, sock_i_uid(sk), sock_i_ino(sk), &len); + (int) (psk - pnres.sk), sock_i_uid(sk), + sock_i_ino(sk), &len); } seq_printf(seq, "%*s\n", 63 - len, ""); return 0;