From cc94bb50d6209f8f4c867136370504f54c95ec02 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 4 Oct 2005 22:45:35 -0700 Subject: [PATCH] --- yaml --- r: 9669 b: refs/heads/master c: 83fa3400ebcba307a60909824a251be984eb9567 h: refs/heads/master i: 9667: b643c2849a13335fbb4ffd581745697500628b22 v: v3 --- [refs] | 2 +- trunk/include/net/xfrm.h | 2 +- trunk/net/xfrm/xfrm_policy.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f020f015810..16004c3f68f3 100644 --- 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 index a9d0d8c5dfbf..7564b2ce449f 100644 --- 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 index fda737d77edc..c6a0d34fc295 100644 --- 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;