summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-07 07:33:13 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 19:39:23 +0300
commit55acbda0965ca0a29b0ca276e7d17a55edc11d1b (patch)
treedb2eb5d570999e3e04f24d1ad57f7544b58df395
parenta06d72c1dcbff015250df6ad9f0b1d18c02113bf (diff)
downloadlinux-55acbda0965ca0a29b0ca276e7d17a55edc11d1b.tar.xz
[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>
-rw-r--r--drivers/usb/storage/transport.c2
-rw-r--r--include/linux/slab.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 47644b5b6155..323293a3e61f 100644
--- 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 6f7b9bb43065..43ced80c327b 100644
--- 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