From 03a81c3275ce600e756b11428cdfb7cd19e025f7 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 4 Oct 2005 22:43:04 -0700
Subject: [PATCH] --- yaml --- r: 9666 b: refs/heads/master c:
 00fa02334540ec795934737cd6e6ef8db2560731 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/key/af_key.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 909d855dcd27..69e882733784 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6f4fafccfa66f0530587ac3c11bb8fd0b8fe8ab
+refs/heads/master: 00fa02334540ec795934737cd6e6ef8db2560731
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index 4879743b945a..50d0a31c3ba6 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -185,7 +185,7 @@ static int pfkey_release(struct socket *sock)
 }
 
 static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,
-			       int allocation, struct sock *sk)
+			       unsigned int __nocast allocation, struct sock *sk)
 {
 	int err = -ENOBUFS;
 
@@ -217,7 +217,7 @@ static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,
 #define BROADCAST_ONE		1
 #define BROADCAST_REGISTERED	2
 #define BROADCAST_PROMISC_ONLY	4
-static int pfkey_broadcast(struct sk_buff *skb, int allocation,
+static int pfkey_broadcast(struct sk_buff *skb, unsigned int __nocast allocation,
 			   int broadcast_flags, struct sock *one_sk)
 {
 	struct sock *sk;
@@ -1416,7 +1416,8 @@ static int pfkey_get(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr,
 	return 0;
 }
 
-static struct sk_buff *compose_sadb_supported(struct sadb_msg *orig, int allocation)
+static struct sk_buff *compose_sadb_supported(struct sadb_msg *orig,
+					      unsigned int __nocast allocation)
 {
 	struct sk_buff *skb;
 	struct sadb_msg *hdr;