[PATCH] slab: remove SLAB_ATOMIC

SLAB_ATOMIC is an alias of GFP_ATOMIC

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

3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index 9659c79e187e..371bf2b1197d 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -377,7 +377,7 @@ static void interfacekit_irq(struct urb *urb)
                 schedule_delayed_work(&kit->do_notify, 0);
 
 resubmit:
-        status = usb_submit_urb(urb, SLAB_ATOMIC);
+        status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status)
                 err("can't resubmit intr, %s-%s/interfacekit0, status %d",
                         kit->udev->bus->bus_name,
@@ -568,7 +568,7 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic
 
         kit->dev_no = -1;
         kit->ifkit = ifkit;
-        kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &kit->data_dma);
+        kit->data = usb_buffer_alloc(dev, URB_INT_SIZE, GFP_ATOMIC, &kit->data_dma);
         if (!kit->data)
                 goto out;
 
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index 2bb4fa572bb7..5727e1ea2f91 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -151,7 +151,7 @@ static void motorcontrol_irq(struct urb *urb)
                 schedule_delayed_work(&mc->do_notify, 0);
 
 resubmit:
-        status = usb_submit_urb(urb, SLAB_ATOMIC);
+        status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status)
                 dev_err(&mc->intf->dev,
                         "can't resubmit intr, %s-%s/motorcontrol0, status %d",
@@ -338,7 +338,7 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic
                 goto out;
 
         mc->dev_no = -1;
-        mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &mc->data_dma);
+        mc->data = usb_buffer_alloc(dev, URB_INT_SIZE, GFP_ATOMIC, &mc->data_dma);
         if (!mc->data)
                 goto out;
 
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 194065dbb51f..ea04dccdc651 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -819,7 +819,7 @@ error:
 
         /* resubmit if we need to, else mark this as done */
         if ((status == 0) && (ctx->pending < ctx->count)) {
-                if ((status = usb_submit_urb (urb, SLAB_ATOMIC)) != 0) {
+                if ((status = usb_submit_urb (urb, GFP_ATOMIC)) != 0) {
                         dbg ("can't resubmit ctrl %02x.%02x, err %d",
                                 reqp->bRequestType, reqp->bRequest, status);
                         urb->dev = NULL;
@@ -999,7 +999,7 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
         context.urb = urb;
         spin_lock_irq (&context.lock);
         for (i = 0; i < param->sglen; i++) {
-                context.status = usb_submit_urb (urb [i], SLAB_ATOMIC);
+                context.status = usb_submit_urb (urb [i], GFP_ATOMIC);
                 if (context.status != 0) {
                         dbg ("can't submit urb[%d], status %d",
                                         i, context.status);
@@ -1041,7 +1041,7 @@ static void unlink1_callback (struct urb *urb)
 
         // we "know" -EPIPE (stall) never happens
         if (!status)
-                status = usb_submit_urb (urb, SLAB_ATOMIC);
+                status = usb_submit_urb (urb, GFP_ATOMIC);
         if (status) {
                 urb->status = status;
                 complete ((struct completion *) urb->context);
@@ -1481,7 +1481,7 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,
         spin_lock_irq (&context.lock);
         for (i = 0; i < param->sglen; i++) {
                 ++context.pending;
-                status = usb_submit_urb (urbs [i], SLAB_ATOMIC);
+                status = usb_submit_urb (urbs [i], GFP_ATOMIC);
                 if (status < 0) {
                         ERROR (dev, "submit iso[%d], error %d\n", i, status);
                         if (i == 0) {