From d4ec4881a72ce98bb23e0929ebafc0de8aa9f0f9 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 6 Dec 2006 20:33:13 -0800 Subject: [PATCH] --- yaml --- r: 42689 b: refs/heads/master c: 55acbda0965ca0a29b0ca276e7d17a55edc11d1b h: refs/heads/master i: 42687: bd81a692034f82601dc8e5d19769cbe3fe10b381 v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/transport.c | 2 +- trunk/include/linux/slab.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c4470db4ee19..f79a74ee6897 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a06d72c1dcbff015250df6ad9f0b1d18c02113bf +refs/heads/master: 55acbda0965ca0a29b0ca276e7d17a55edc11d1b diff --git a/trunk/drivers/usb/storage/transport.c b/trunk/drivers/usb/storage/transport.c index 47644b5b6155..323293a3e61f 100644 --- a/trunk/drivers/usb/storage/transport.c +++ b/trunk/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/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 6f7b9bb43065..43ced80c327b 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/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