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

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9be41ed1f9a6..0a46acf557ac 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -460,7 +460,7 @@ void usb_hub_tt_clear_buffer (struct usb_device *udev, int pipe)
          * since each TT has "at least two" buffers that can need it (and
          * there can be many TTs per hub).  even if they're uncommon.
          */
-        if ((clear = kmalloc (sizeof *clear, SLAB_ATOMIC)) == NULL) {
+        if ((clear = kmalloc (sizeof *clear, GFP_ATOMIC)) == NULL) {
                 dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
                 /* FIXME recover somehow ... RESET_TT? */
                 return;
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 7390b67c609d..149aa8bfb1fe 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -488,7 +488,7 @@ void usb_sg_wait (struct usb_sg_request *io)
                 int     retval;
 
                 io->urbs [i]->dev = io->dev;
-                retval = usb_submit_urb (io->urbs [i], SLAB_ATOMIC);
+                retval = usb_submit_urb (io->urbs [i], GFP_ATOMIC);
 
                 /* after we submit, let completions or cancelations fire;
                  * we handshake using io->status.