commit 54e6ecb23951b195d02433a741c7f7cb0b796c78
author Christoph Lameter <clameter@sgi.com> Wed Dec 06 20:33:16 2006 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> Thu Dec 07 08:39:24 2006 -0800
tree c8885c49f37c8d383945b8af69d51597494ed62c
parent f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6

[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>

drivers/base/dmapool.c

diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index b2efbd4..fa46752 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -297,7 +297,7 @@
 			}
 		}
 	}
-	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);