diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
| commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
| tree | c8885c49f37c8d383945b8af69d51597494ed62c /net/ipv6/xfrm6_tunnel.c | |
| parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) | |
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 01a5c52a2be3..d4f68b0f27d5 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
| @@ -180,7 +180,7 @@ try_next_2:; | |||
| 180 | spi = 0; | 180 | spi = 0; |
| 181 | goto out; | 181 | goto out; |
| 182 | alloc_spi: | 182 | alloc_spi: |
| 183 | x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC); | 183 | x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, GFP_ATOMIC); |
| 184 | if (!x6spi) | 184 | if (!x6spi) |
| 185 | goto out; | 185 | goto out; |
| 186 | 186 | ||