summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorChristoph Lameter2006-12-07 05:33:16 +0100
committerLinus Torvalds2006-12-07 17:39:24 +0100
commit54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch)
treec8885c49f37c8d383945b8af69d51597494ed62c /drivers/base
parent[PATCH] slab: remove SLAB_USER (diff)
downloadkernel-qcow2-linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.gz
kernel-qcow2-linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.xz
kernel-qcow2-linux-54e6ecb23951b195d02433a741c7f7cb0b796c78.zip
[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')
-rw-r--r--drivers/base/dmapool.c2
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:
}
}
}
- if (!(page = pool_alloc_page (pool, SLAB_ATOMIC))) {
+ if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) {
if (mem_flags & __GFP_WAIT) {
DECLARE_WAITQUEUE (wait, current);