Commit 55acbda0 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] slab: remove SLAB_NOIO 



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

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a06d72c1

drivers/usb/storage/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/slab.h

+0 −1
Original line number Diff line number Diff line
@@ -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