diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
| commit | 77501f3cb648e18733509a951ed31eddd7ef2c0b (patch) | |
| tree | 82624caa354394df2422562bf6dda56a2c088704 /net/xfrm/xfrm_policy.c | |
| parent | 422fa08e538b649a9b80258950d2f8a202f45f19 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 061b44cc2451..cbb0ba34a600 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -225,7 +225,7 @@ expired: | |||
| 225 | * SPD calls. | 225 | * SPD calls. |
| 226 | */ | 226 | */ |
| 227 | 227 | ||
| 228 | struct xfrm_policy *xfrm_policy_alloc(unsigned int __nocast gfp) | 228 | struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp) |
| 229 | { | 229 | { |
| 230 | struct xfrm_policy *policy; | 230 | struct xfrm_policy *policy; |
| 231 | 231 | ||