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 /drivers/base/dmapool.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 'drivers/base/dmapool.c')
| -rw-r--r-- | drivers/base/dmapool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c index b2efbd4cf710..fa4675254f67 100644 --- a/drivers/base/dmapool.c +++ b/drivers/base/dmapool.c | |||
| @@ -297,7 +297,7 @@ restart: | |||
| 297 | } | 297 | } |
| 298 | } | 298 | } |
| 299 | } | 299 | } |
| 300 | if (!(page = pool_alloc_page (pool, SLAB_ATOMIC))) { | 300 | if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) { |
| 301 | if (mem_flags & __GFP_WAIT) { | 301 | if (mem_flags & __GFP_WAIT) { |
| 302 | DECLARE_WAITQUEUE (wait, current); | 302 | DECLARE_WAITQUEUE (wait, current); |
| 303 | 303 | ||