---

yaml --- r: 9669 b: refs/heads/master c: 83fa340 h: refs/heads/master i: 9667: b643c28 v: v3
git-mirror · Oct 5, 2005 · cc94bb5 · cc94bb5
1 parent b144135
commit cc94bb5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d2aef668920e8d93b77f145f8f647f62abe75db
+refs/heads/master: 83fa3400ebcba307a60909824a251be984eb9567
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
@@ -875,7 +875,7 @@ static inline int xfrm_dst_lookup(struct xfrm_dst **dst, struct flowi *fl, unsig
 } 
 #endif
 
-struct xfrm_policy *xfrm_policy_alloc(int gfp);
+struct xfrm_policy *xfrm_policy_alloc(unsigned int __nocast gfp);
 extern int xfrm_policy_walk(int (*func)(struct xfrm_policy *, int, int, void*), void *);
 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);
 struct xfrm_policy *xfrm_policy_bysel(int dir, struct xfrm_selector *sel,

diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
@@ -225,7 +225,7 @@ static void xfrm_policy_timer(unsigned long data)
  * SPD calls.
  */
 
-struct xfrm_policy *xfrm_policy_alloc(int gfp)
+struct xfrm_policy *xfrm_policy_alloc(unsigned int __nocast gfp)
 {
 	struct xfrm_policy *policy;