From 8963fbc0478967c59108e04a543e0f98e62547f0 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 15 Sep 2010 21:34:41 -0700
Subject: [PATCH] --- yaml --- r: 214551 b: refs/heads/master c:
 9e0064a5456fd75fd7c70f6f3692c7f732f91a65 h: refs/heads/master i:   214549:
 8b9be9b0b12160aba495257c5f8fc4d76330b618   214547:
 9244c5bdcdec8758d9cfd838d501d91e6fd953d9   214543:
 bda5a2737a97337577b0531b5cf527d78c5b9cc5 v: v3

---
 [refs]                    | 2 +-
 trunk/net/phonet/socket.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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;