[PATCH] slab: remove SLAB_KERNEL

SLAB_KERNEL is an alias of GFP_KERNEL.

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, 10 insertions, 10 deletions

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 5857e7e23f84..63b629b1cdb2 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2218,21 +2218,21 @@ static int gigaset_probe(struct usb_interface *interface,
          * - three for the different uses of the default control pipe
          * - three for each isochronous pipe
          */
-        if (!(ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL)) ||
-            !(ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL)) ||
-            !(ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL)) ||
-            !(ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL)))
+        if (!(ucs->urb_int_in = usb_alloc_urb(0, GFP_KERNEL)) ||
+            !(ucs->urb_cmd_in = usb_alloc_urb(0, GFP_KERNEL)) ||
+            !(ucs->urb_cmd_out = usb_alloc_urb(0, GFP_KERNEL)) ||
+            !(ucs->urb_ctrl = usb_alloc_urb(0, GFP_KERNEL)))
                 goto allocerr;
 
         for (j = 0; j < 2; ++j) {
                 ubc = cs->bcs[j].hw.bas;
                 for (i = 0; i < BAS_OUTURBS; ++i)
                         if (!(ubc->isoouturbs[i].urb =
-                              usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL)))
+                              usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL)))
                                 goto allocerr;
                 for (i = 0; i < BAS_INURBS; ++i)
                         if (!(ubc->isoinurbs[i] =
-                              usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL)))
+                              usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL)))
                                 goto allocerr;
         }
 
@@ -2246,7 +2246,7 @@ static int gigaset_probe(struct usb_interface *interface,
                                         (endpoint->bEndpointAddress) & 0x0f),
                          ucs->int_in_buf, 3, read_int_callback, cs,
                          endpoint->bInterval);
-        if ((rc = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL)) != 0) {
+        if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) {
                 dev_err(cs->dev, "could not submit interrupt URB: %s\n",
                         get_usb_rcmsg(rc));
                 goto error;
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index af89ce188f2a..04f2ad7ba8b0 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -763,7 +763,7 @@ static int gigaset_probe(struct usb_interface *interface,
                 goto error;
         }
 
-        ucs->bulk_out_urb = usb_alloc_urb(0, SLAB_KERNEL);
+        ucs->bulk_out_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!ucs->bulk_out_urb) {
                 dev_err(cs->dev, "Couldn't allocate bulk_out_urb\n");
                 retval = -ENOMEM;
@@ -774,7 +774,7 @@ static int gigaset_probe(struct usb_interface *interface,
 
         atomic_set(&ucs->busy, 0);
 
-        ucs->read_urb = usb_alloc_urb(0, SLAB_KERNEL);
+        ucs->read_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!ucs->read_urb) {
                 dev_err(cs->dev, "No free urbs available\n");
                 retval = -ENOMEM;
@@ -797,7 +797,7 @@ static int gigaset_probe(struct usb_interface *interface,
                          gigaset_read_int_callback,
                          cs->inbuf + 0, endpoint->bInterval);
 
-        retval = usb_submit_urb(ucs->read_urb, SLAB_KERNEL);
+        retval = usb_submit_urb(ucs->read_urb, GFP_KERNEL);
         if (retval) {
                 dev_err(cs->dev, "Could not submit URB (error %d)\n", -retval);
                 goto error;