diff options
| -rw-r--r-- | drivers/usb/storage/transport.c | 2 | ||||
| -rw-r--r-- | include/linux/slab.h | 1 |
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, | |||
| 427 | US_DEBUGP("%s: xfer %u bytes, %d entries\n", __FUNCTION__, | 427 | US_DEBUGP("%s: xfer %u bytes, %d entries\n", __FUNCTION__, |
| 428 | length, num_sg); | 428 | length, num_sg); |
| 429 | result = usb_sg_init(&us->current_sg, us->pusb_dev, pipe, 0, | 429 | result = usb_sg_init(&us->current_sg, us->pusb_dev, pipe, 0, |
| 430 | sg, num_sg, length, SLAB_NOIO); | 430 | sg, num_sg, length, GFP_NOIO); |
| 431 | if (result) { | 431 | if (result) { |
| 432 | US_DEBUGP("usb_sg_init returned %d\n", result); | 432 | US_DEBUGP("usb_sg_init returned %d\n", result); |
| 433 | return USB_STOR_XFER_ERROR; | 433 | 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; | |||
| 20 | 20 | ||
| 21 | /* flags for kmem_cache_alloc() */ | 21 | /* flags for kmem_cache_alloc() */ |
| 22 | #define SLAB_NOFS GFP_NOFS | 22 | #define SLAB_NOFS GFP_NOFS |
| 23 | #define SLAB_NOIO GFP_NOIO | ||
| 24 | #define SLAB_ATOMIC GFP_ATOMIC | 23 | #define SLAB_ATOMIC GFP_ATOMIC |
| 25 | #define SLAB_USER GFP_USER | 24 | #define SLAB_USER GFP_USER |
| 26 | #define SLAB_KERNEL GFP_KERNEL | 25 | #define SLAB_KERNEL GFP_KERNEL |