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/sctp | |
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/sctp')
-rw-r--r-- | net/sctp/sm_make_chunk.c | 2 | ||||
-rw-r--r-- | net/sctp/socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 04954e5f6846..8d55d10041f9 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -979,7 +979,7 @@ struct sctp_chunk *sctp_chunkify(struct sk_buff *skb, | |||
979 | { | 979 | { |
980 | struct sctp_chunk *retval; | 980 | struct sctp_chunk *retval; |
981 | 981 | ||
982 | retval = kmem_cache_alloc(sctp_chunk_cachep, SLAB_ATOMIC); | 982 | retval = kmem_cache_alloc(sctp_chunk_cachep, GFP_ATOMIC); |
983 | 983 | ||
984 | if (!retval) | 984 | if (!retval) |
985 | goto nodata; | 985 | goto nodata; |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 02b27145b279..49607792cbd3 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -4989,7 +4989,7 @@ static struct sctp_bind_bucket *sctp_bucket_create( | |||
4989 | { | 4989 | { |
4990 | struct sctp_bind_bucket *pp; | 4990 | struct sctp_bind_bucket *pp; |
4991 | 4991 | ||
4992 | pp = kmem_cache_alloc(sctp_bucket_cachep, SLAB_ATOMIC); | 4992 | pp = kmem_cache_alloc(sctp_bucket_cachep, GFP_ATOMIC); |
4993 | SCTP_DBG_OBJCNT_INC(bind_bucket); | 4993 | SCTP_DBG_OBJCNT_INC(bind_bucket); |
4994 | if (pp) { | 4994 | if (pp) { |
4995 | pp->port = snum; | 4995 | pp->port = snum; |