[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>

4 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index 907b820a5faf..4852012735f6 100644
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -345,7 +345,7 @@ static void catc_irq_done(struct urb *urb)
                 } 
         }
 resubmit:
-        status = usb_submit_urb (urb, SLAB_ATOMIC);
+        status = usb_submit_urb (urb, GFP_ATOMIC);
         if (status)
                 err ("can't resubmit intr, %s-%s, status %d",
                                 catc->usbdev->bus->bus_name,
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index a77410562e12..493635954513 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -383,7 +383,7 @@ static void nc_ensure_sync(struct usbnet *dev)
                 int                     status;
 
                 /* Send a flush */
-                urb = usb_alloc_urb(0, SLAB_ATOMIC);
+                urb = usb_alloc_urb(0, GFP_ATOMIC);
                 if (!urb)
                         return;
 
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index b5690b3834e3..d48c024cff59 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -856,7 +856,7 @@ static void intr_callback(struct urb *urb)
                 pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4];
         }
 
-        status = usb_submit_urb(urb, SLAB_ATOMIC);
+        status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status == -ENODEV)
                 netif_device_detach(pegasus->net);
         if (status && netif_msg_timer(pegasus))
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index 72171f94ded4..c54235f73cb6 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -587,7 +587,7 @@ static void intr_callback(struct urb *urb)
         }
 
 resubmit:
-        status = usb_submit_urb (urb, SLAB_ATOMIC);
+        status = usb_submit_urb (urb, GFP_ATOMIC);
         if (status == -ENODEV)
                 netif_device_detach(dev->netdev);
         else if (status)