Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[safe/jmp/linux-2.6] / net / sunrpc / xprt.c

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 65fe2e4..3fc3253 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -984,7 +984,7 @@ void xprt_reserve(struct rpc_task *task)
 
 static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt)
 {
 
 static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt)
 {

-       return xprt->xid++;
+       return (__force __be32)xprt->xid++;

 }
 
 static inline void xprt_init_xid(struct rpc_xprt *xprt)
 }
 
 static inline void xprt_init_xid(struct rpc_xprt *xprt)