Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[powerpc.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 1c52fe8..9602ceb 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -940,7 +940,7 @@ static struct sk_buff *sock_alloc_send_pskb(struct sock *sk,
                                            int noblock, int *errcode)
 {
        struct sk_buff *skb;
-       unsigned int gfp_mask;
+       gfp_t gfp_mask;
        long timeo;
        int err;