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/core/dst.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/core/dst.c')
| -rw-r--r-- | net/core/dst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index 1a5e49da0e77..836ec6606925 100644 --- a/net/core/dst.c +++ b/net/core/dst.c | |||
| @@ -125,7 +125,7 @@ void * dst_alloc(struct dst_ops * ops) | |||
| 125 | if (ops->gc()) | 125 | if (ops->gc()) |
| 126 | return NULL; | 126 | return NULL; |
| 127 | } | 127 | } |
| 128 | dst = kmem_cache_alloc(ops->kmem_cachep, SLAB_ATOMIC); | 128 | dst = kmem_cache_alloc(ops->kmem_cachep, GFP_ATOMIC); |
| 129 | if (!dst) | 129 | if (!dst) |
| 130 | return NULL; | 130 | return NULL; |
| 131 | memset(dst, 0, ops->entry_size); | 131 | memset(dst, 0, ops->entry_size); |