[PATCH] slab: remove SLAB_NOIO

SLAB_NOIO is an alias of GFP_NOIO with a single instance of use.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 47644b5b61553c4082257aa8cd4763587375c197..323293a3e61f08936ab16fcbc9820fdcc9056492 100644 (file)
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -427,7 +427,7 @@ static int usb_stor_bulk_transfer_sglist(struct us_data *us, unsigned int pipe,
        US_DEBUGP("%s: xfer %u bytes, %d entries\n", __FUNCTION__,
                        length, num_sg);
        result = usb_sg_init(&us->current_sg, us->pusb_dev, pipe, 0,
-                       sg, num_sg, length, SLAB_NOIO);
+                       sg, num_sg, length, GFP_NOIO);
        if (result) {
                US_DEBUGP("usb_sg_init returned %d\n", result);
                return USB_STOR_XFER_ERROR;

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 6f7b9bb43065828a4217cc246b5dca46fc020b0b..43ced80c327ba3e5f265568c82f371ff9d1433a7 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -20,7 +20,6 @@ typedef struct kmem_cache kmem_cache_t;
 
 /* flags for kmem_cache_alloc() */
 #define        SLAB_NOFS               GFP_NOFS
-#define        SLAB_NOIO               GFP_NOIO
 #define        SLAB_ATOMIC             GFP_ATOMIC
 #define        SLAB_USER               GFP_USER
 #define        SLAB_KERNEL             GFP_KERNEL