include/linux: enclose idr.h in #ifndef

[mv-sheeva.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 1c52fe809edad0a79038748f589c915ec96f6a6f..9602ceb3bac9a2d33eec5ce1bc0cb8a55340203b 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;