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

35 files changed, 71 insertions, 71 deletions

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 2a2f0fc2288f..ec8a7a633e68 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -820,7 +820,7 @@ he_init_group(struct he_dev *he_dev, int group)
                 void *cpuaddr;
 
 #ifdef USE_RBPS_POOL 
-                cpuaddr = pci_pool_alloc(he_dev->rbps_pool, SLAB_KERNEL|SLAB_DMA, &dma_handle);
+                cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|SLAB_DMA, &dma_handle);
                 if (cpuaddr == NULL)
                         return -ENOMEM;
 #else
@@ -884,7 +884,7 @@ he_init_group(struct he_dev *he_dev, int group)
                 void *cpuaddr;
 
 #ifdef USE_RBPL_POOL
-                cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, SLAB_KERNEL|SLAB_DMA, &dma_handle);
+                cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|SLAB_DMA, &dma_handle);
                 if (cpuaddr == NULL)
                         return -ENOMEM;
 #else
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index fa4675254f67..dbe0735f8c9e 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -126,7 +126,7 @@ dma_pool_create (const char *name, struct device *dev,
         } else if (allocation < size)
                 return NULL;
 
-        if (!(retval = kmalloc (sizeof *retval, SLAB_KERNEL)))
+        if (!(retval = kmalloc (sizeof *retval, GFP_KERNEL)))
                 return retval;
 
         strlcpy (retval->name, name, sizeof retval->name);
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 0358419a0e48..8e8726104619 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -636,10 +636,10 @@ static int ioat_self_test(struct ioat_device *device)
         dma_cookie_t cookie;
         int err = 0;
 
-        src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, SLAB_KERNEL);
+        src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL);
         if (!src)
                 return -ENOMEM;
-        dest = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, SLAB_KERNEL);
+        dest = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL);
         if (!dest) {
                 kfree(src);
                 return -ENOMEM;
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 8f4378a1631c..b935e08695a9 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -123,7 +123,7 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
         int i;
         int hostnum = 0;
 
-        h = kzalloc(sizeof(*h) + extra, SLAB_KERNEL);
+        h = kzalloc(sizeof(*h) + extra, GFP_KERNEL);
         if (!h)
                 return NULL;
 
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 6e8ea9110c46..eae97d8dcf03 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -1225,7 +1225,7 @@ static int ohci_iso_recv_init(struct hpsb_iso *iso)
         int ctx;
         int ret = -ENOMEM;
 
-        recv = kmalloc(sizeof(*recv), SLAB_KERNEL);
+        recv = kmalloc(sizeof(*recv), GFP_KERNEL);
         if (!recv)
                 return -ENOMEM;
 
@@ -1918,7 +1918,7 @@ static int ohci_iso_xmit_init(struct hpsb_iso *iso)
         int ctx;
         int ret = -ENOMEM;
 
-        xmit = kmalloc(sizeof(*xmit), SLAB_KERNEL);
+        xmit = kmalloc(sizeof(*xmit), GFP_KERNEL);
         if (!xmit)
                 return -ENOMEM;
 
@@ -3021,7 +3021,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d,
                         return -ENOMEM;
                 }
 
-                d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, SLAB_KERNEL, d->prg_bus+i);
+                d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, GFP_KERNEL, d->prg_bus+i);
                 OHCI_DMA_ALLOC("pool dma_rcv prg[%d]", i);
 
                 if (d->prg_cpu[i] != NULL) {
@@ -3117,7 +3117,7 @@ alloc_dma_trm_ctx(struct ti_ohci *ohci, struct dma_trm_ctx *d,
         OHCI_DMA_ALLOC("dma_rcv prg pool");
 
         for (i = 0; i < d->num_desc; i++) {
-                d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, SLAB_KERNEL, d->prg_bus+i);
+                d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, GFP_KERNEL, d->prg_bus+i);
                 OHCI_DMA_ALLOC("pool dma_trm prg[%d]", i);
 
                 if (d->prg_cpu[i] != NULL) {
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 0a7412e27eb4..9cab1d661472 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1428,7 +1428,7 @@ static int __devinit add_card(struct pci_dev *dev,
                 struct i2c_algo_bit_data i2c_adapter_data;
 
                 error = -ENOMEM;
-                i2c_ad = kmalloc(sizeof(*i2c_ad), SLAB_KERNEL);
+                i2c_ad = kmalloc(sizeof(*i2c_ad), GFP_KERNEL);
                 if (!i2c_ad) FAIL("failed to allocate I2C adapter memory");
 
                 memcpy(i2c_ad, &bit_ops, sizeof(struct i2c_adapter));
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 47f6a4e29b40..bf71e069eaf5 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -112,7 +112,7 @@ static struct pending_request *__alloc_pending_request(gfp_t flags)
 
 static inline struct pending_request *alloc_pending_request(void)
 {
-        return __alloc_pending_request(SLAB_KERNEL);
+        return __alloc_pending_request(GFP_KERNEL);
 }
 
 static void free_pending_request(struct pending_request *req)
@@ -1737,7 +1737,7 @@ static int arm_register(struct file_info *fi, struct pending_request *req)
                 return (-EINVAL);
         }
         /* addr-list-entry for fileinfo */
-        addr = kmalloc(sizeof(*addr), SLAB_KERNEL);
+        addr = kmalloc(sizeof(*addr), GFP_KERNEL);
         if (!addr) {
                 req->req.length = 0;
                 return (-ENOMEM);
@@ -2103,7 +2103,7 @@ static int write_phypacket(struct file_info *fi, struct pending_request *req)
 static int get_config_rom(struct file_info *fi, struct pending_request *req)
 {
         int ret = sizeof(struct raw1394_request);
-        quadlet_t *data = kmalloc(req->req.length, SLAB_KERNEL);
+        quadlet_t *data = kmalloc(req->req.length, GFP_KERNEL);
         int status;
 
         if (!data)
@@ -2133,7 +2133,7 @@ static int get_config_rom(struct file_info *fi, struct pending_request *req)
 static int update_config_rom(struct file_info *fi, struct pending_request *req)
 {
         int ret = sizeof(struct raw1394_request);
-        quadlet_t *data = kmalloc(req->req.length, SLAB_KERNEL);
+        quadlet_t *data = kmalloc(req->req.length, GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
         if (copy_from_user(data, int2ptr(req->req.sendb), req->req.length)) {
@@ -2779,7 +2779,7 @@ static int raw1394_open(struct inode *inode, struct file *file)
 {
         struct file_info *fi;
 
-        fi = kzalloc(sizeof(*fi), SLAB_KERNEL);
+        fi = kzalloc(sizeof(*fi), GFP_KERNEL);
         if (!fi)
                 return -ENOMEM;
 
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index 214e2fdddeef..0d6e2c4bb245 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -57,7 +57,7 @@ struct ib_ah *ehca_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
         struct ehca_shca *shca = container_of(pd->device, struct ehca_shca,
                                               ib_device);
 
-        av = kmem_cache_alloc(av_cache, SLAB_KERNEL);
+        av = kmem_cache_alloc(av_cache, GFP_KERNEL);
         if (!av) {
                 ehca_err(pd->device, "Out of memory pd=%p ah_attr=%p",
                          pd, ah_attr);
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 458fe19648a1..93995b658d94 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -134,7 +134,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe,
         if (cqe >= 0xFFFFFFFF - 64 - additional_cqe)
                 return ERR_PTR(-EINVAL);
 
-        my_cq = kmem_cache_alloc(cq_cache, SLAB_KERNEL);
+        my_cq = kmem_cache_alloc(cq_cache, GFP_KERNEL);
         if (!my_cq) {
                 ehca_err(device, "Out of memory for ehca_cq struct device=%p",
                          device);
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 3d1c1c535038..cc47e4c13a18 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -108,7 +108,7 @@ static struct kmem_cache *ctblk_cache = NULL;
 
 void *ehca_alloc_fw_ctrlblock(void)
 {
-        void *ret = kmem_cache_zalloc(ctblk_cache, SLAB_KERNEL);
+        void *ret = kmem_cache_zalloc(ctblk_cache, GFP_KERNEL);
         if (!ret)
                 ehca_gen_err("Out of memory for ctblk");
         return ret;
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index abce676c0ae0..0a5e2214cc5f 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -53,7 +53,7 @@ static struct ehca_mr *ehca_mr_new(void)
 {
         struct ehca_mr *me;
 
-        me = kmem_cache_alloc(mr_cache, SLAB_KERNEL);
+        me = kmem_cache_alloc(mr_cache, GFP_KERNEL);
         if (me) {
                 memset(me, 0, sizeof(struct ehca_mr));
                 spin_lock_init(&me->mrlock);
@@ -72,7 +72,7 @@ static struct ehca_mw *ehca_mw_new(void)
 {
         struct ehca_mw *me;
 
-        me = kmem_cache_alloc(mw_cache, SLAB_KERNEL);
+        me = kmem_cache_alloc(mw_cache, GFP_KERNEL);
         if (me) {
                 memset(me, 0, sizeof(struct ehca_mw));
                 spin_lock_init(&me->mwlock);
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index 2c3cdc6f7b39..d5345e5b3cd6 100644
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -50,7 +50,7 @@ struct ib_pd *ehca_alloc_pd(struct ib_device *device,
 {
         struct ehca_pd *pd;
 
-        pd = kmem_cache_alloc(pd_cache, SLAB_KERNEL);
+        pd = kmem_cache_alloc(pd_cache, GFP_KERNEL);
         if (!pd) {
                 ehca_err(device, "device=%p context=%p out of memory",
                          device, context);
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 8682aa50c707..c6c9cef203e3 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -450,7 +450,7 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
         if (pd->uobject && udata)
                 context = pd->uobject->context;
 
-        my_qp = kmem_cache_alloc(qp_cache, SLAB_KERNEL);
+        my_qp = kmem_cache_alloc(qp_cache, GFP_KERNEL);
         if (!my_qp) {
                 ehca_err(pd->device, "pd=%p not enough memory to alloc qp", pd);
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index f56d6a0f0624..0517c7387d67 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -189,7 +189,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 {
         struct spi_device       *spi = to_spi_device(dev);
         struct ads7846          *ts = dev_get_drvdata(dev);
-        struct ser_req          *req = kzalloc(sizeof *req, SLAB_KERNEL);
+        struct ser_req          *req = kzalloc(sizeof *req, GFP_KERNEL);
         int                     status;
         int                     sample;
         int                     i;
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;
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 206c13e47a06..9123147e376f 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -287,7 +287,7 @@ static int cinergyt2_alloc_stream_urbs (struct cinergyt2 *cinergyt2)
         int i;
 
         cinergyt2->streambuf = usb_buffer_alloc(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,
-                                              SLAB_KERNEL, &cinergyt2->streambuf_dmahandle);
+                                              GFP_KERNEL, &cinergyt2->streambuf_dmahandle);
         if (!cinergyt2->streambuf) {
                 dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n");
                 return -ENOMEM;
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index ef4a731ca5c2..334e078ffaff 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -451,7 +451,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
                 return -ENODEV;
         }
 
-        flash = kzalloc(sizeof *flash, SLAB_KERNEL);
+        flash = kzalloc(sizeof *flash, GFP_KERNEL);
         if (!flash)
                 return -ENOMEM;
 
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index ccd4dafce8e2..b318500785e5 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6940,7 +6940,7 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
                 return -ENOMEM;
 
         for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
-                ipr_cmd = pci_pool_alloc (ioa_cfg->ipr_cmd_pool, SLAB_KERNEL, &dma_addr);
+                ipr_cmd = pci_pool_alloc (ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr);
 
                 if (!ipr_cmd) {
                         ipr_free_cmd_blks(ioa_cfg);
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index c3c0626f550b..09f2c74a40c5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -360,7 +360,7 @@ spi_alloc_master(struct device *dev, unsigned size)
         if (!dev)
                 return NULL;
 
-        master = kzalloc(size + sizeof *master, SLAB_KERNEL);
+        master = kzalloc(size + sizeof *master, GFP_KERNEL);
         if (!master)
                 return NULL;
 
@@ -607,7 +607,7 @@ static int __init spi_init(void)
 {
         int     status;
 
-        buf = kmalloc(SPI_BUFSIZ, SLAB_KERNEL);
+        buf = kmalloc(SPI_BUFSIZ, GFP_KERNEL);
         if (!buf) {
                 status = -ENOMEM;
                 goto err0;
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 08c1c57c6128..57289b61d0be 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -196,7 +196,7 @@ int spi_bitbang_setup(struct spi_device *spi)
                 return -EINVAL;
 
         if (!cs) {
-                cs = kzalloc(sizeof *cs, SLAB_KERNEL);
+                cs = kzalloc(sizeof *cs, GFP_KERNEL);
                 if (!cs)
                         return -ENOMEM;
                 spi->controller_state = cs;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 0a46acf557ac..77c05be5241a 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2371,7 +2371,7 @@ check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port1)
         struct usb_qualifier_descriptor *qual;
         int                             status;
 
-        qual = kmalloc (sizeof *qual, SLAB_KERNEL);
+        qual = kmalloc (sizeof *qual, GFP_KERNEL);
         if (qual == NULL)
                 return;
 
@@ -2922,7 +2922,7 @@ static int config_descriptors_changed(struct usb_device *udev)
                 if (len < le16_to_cpu(udev->config[index].desc.wTotalLength))
                         len = le16_to_cpu(udev->config[index].desc.wTotalLength);
         }
-        buf = kmalloc (len, SLAB_KERNEL);
+        buf = kmalloc (len, GFP_KERNEL);
         if (buf == NULL) {
                 dev_err(&udev->dev, "no mem to re-read configs after reset\n");
                 /* assume the worst */
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 64554acad63f..31351826f2ba 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -1236,7 +1236,7 @@ autoconf_fail:
 
 
         /* ok, we made sense of the hardware ... */
-        dev = kzalloc(sizeof(*dev), SLAB_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev) {
                 return -ENOMEM;
         }
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index a3076da3f4eb..805a9826842d 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1864,7 +1864,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* alloc, and start init */
-        dev = kmalloc (sizeof *dev, SLAB_KERNEL);
+        dev = kmalloc (sizeof *dev, GFP_KERNEL);
         if (dev == NULL){
                 pr_debug("enomem %s\n", pci_name(pdev));
                 retval = -ENOMEM;
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 86924f9cdd7e..3fb1044a4db0 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -412,7 +412,7 @@ ep_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
         /* FIXME readahead for O_NONBLOCK and poll(); careful with ZLPs */
 
         value = -ENOMEM;
-        kbuf = kmalloc (len, SLAB_KERNEL);
+        kbuf = kmalloc (len, GFP_KERNEL);
         if (unlikely (!kbuf))
                 goto free1;
 
@@ -456,7 +456,7 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         /* FIXME writebehind for O_NONBLOCK and poll(), qlen = 1 */
 
         value = -ENOMEM;
-        kbuf = kmalloc (len, SLAB_KERNEL);
+        kbuf = kmalloc (len, GFP_KERNEL);
         if (!kbuf)
                 goto free1;
         if (copy_from_user (kbuf, buf, len)) {
@@ -1898,7 +1898,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         buf += 4;
         length -= 4;
 
-        kbuf = kmalloc (length, SLAB_KERNEL);
+        kbuf = kmalloc (length, GFP_KERNEL);
         if (!kbuf)
                 return -ENOMEM;
         if (copy_from_user (kbuf, buf, length)) {
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 0b590831582c..3024c679e38e 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2861,7 +2861,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* alloc, and start init */
-        dev = kzalloc (sizeof *dev, SLAB_KERNEL);
+        dev = kzalloc (sizeof *dev, GFP_KERNEL);
         if (dev == NULL){
                 retval = -ENOMEM;
                 goto done;
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 48a09fd89d18..030d87c28c2f 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2581,7 +2581,7 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
         /* UDC_PULLUP_EN gates the chip clock */
         // OTG_SYSCON_1_REG |= DEV_IDLE_EN;
 
-        udc = kzalloc(sizeof(*udc), SLAB_KERNEL);
+        udc = kzalloc(sizeof(*udc), GFP_KERNEL);
         if (!udc)
                 return -ENOMEM;
 
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 0f809dd68492..40710ea1b490 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1190,7 +1190,7 @@ autoconf_fail:
 
 
         /* ok, we made sense of the hardware ... */
-        dev = kzalloc(sizeof(*dev), SLAB_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
         spin_lock_init (&dev->lock);
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c
index 396dc69d4b4c..7fd872aa654a 100644
--- a/drivers/usb/host/hc_crisv10.c
+++ b/drivers/usb/host/hc_crisv10.c
@@ -188,7 +188,7 @@ static DEFINE_TIMER(bulk_eot_timer, NULL, 0, 0);
 #define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \
 {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);}
 
-#define SLAB_FLAG     (in_interrupt() ? GFP_ATOMIC : SLAB_KERNEL)
+#define SLAB_FLAG     (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)
 #define KMALLOC_FLAG  (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)
 
 /* Most helpful debugging aid */
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 2dbb77414905..7f26f9bdbaf1 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -134,7 +134,7 @@ static int isp1301_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct i2c_client *c;
 
-        c = (struct i2c_client *)kzalloc(sizeof(*c), SLAB_KERNEL);
+        c = (struct i2c_client *)kzalloc(sizeof(*c), GFP_KERNEL);
 
         if (!c)
                 return -ENOMEM;
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 0096373b5f98..909138e5aa04 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -152,7 +152,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         if (!acecad || !input_dev)
                 goto fail1;
 
-        acecad->data = usb_buffer_alloc(dev, 8, SLAB_KERNEL, &acecad->data_dma);
+        acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma);
         if (!acecad->data)
                 goto fail1;
 
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 49704d4ed0e2..7f3c57da9bc0 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -680,7 +680,7 @@ static int usbtouch_probe(struct usb_interface *intf,
                 type->process_pkt = usbtouch_process_pkt;
 
         usbtouch->data = usb_buffer_alloc(udev, type->rept_size,
-                                          SLAB_KERNEL, &usbtouch->data_dma);
+                                          GFP_KERNEL, &usbtouch->data_dma);
         if (!usbtouch->data)
                 goto out_free;
 
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index ea04dccdc651..fb321864a92d 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -213,7 +213,7 @@ static struct urb *simple_alloc_urb (
 
         if (bytes < 0)
                 return NULL;
-        urb = usb_alloc_urb (0, SLAB_KERNEL);
+        urb = usb_alloc_urb (0, GFP_KERNEL);
         if (!urb)
                 return urb;
         usb_fill_bulk_urb (urb, udev, pipe, NULL, bytes, simple_callback, NULL);
@@ -223,7 +223,7 @@ static struct urb *simple_alloc_urb (
         urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
         if (usb_pipein (pipe))
                 urb->transfer_flags |= URB_SHORT_NOT_OK;
-        urb->transfer_buffer = usb_buffer_alloc (udev, bytes, SLAB_KERNEL,
+        urb->transfer_buffer = usb_buffer_alloc (udev, bytes, GFP_KERNEL,
                         &urb->transfer_dma);
         if (!urb->transfer_buffer) {
                 usb_free_urb (urb);
@@ -315,7 +315,7 @@ static int simple_io (
                 init_completion (&completion);
                 if (usb_pipeout (urb->pipe))
                         simple_fill_buf (urb);
-                if ((retval = usb_submit_urb (urb, SLAB_KERNEL)) != 0)
+                if ((retval = usb_submit_urb (urb, GFP_KERNEL)) != 0)
                         break;
 
                 /* NOTE:  no timeouts; can't be broken out of by interrupt */
@@ -374,7 +374,7 @@ alloc_sglist (int nents, int max, int vary)
         unsigned                i;
         unsigned                size = max;
 
-        sg = kmalloc (nents * sizeof *sg, SLAB_KERNEL);
+        sg = kmalloc (nents * sizeof *sg, GFP_KERNEL);
         if (!sg)
                 return NULL;
 
@@ -382,7 +382,7 @@ alloc_sglist (int nents, int max, int vary)
                 char            *buf;
                 unsigned        j;
 
-                buf = kzalloc (size, SLAB_KERNEL);
+                buf = kzalloc (size, GFP_KERNEL);
                 if (!buf) {
                         free_sglist (sg, i);
                         return NULL;
@@ -428,7 +428,7 @@ static int perform_sglist (
                                 (udev->speed == USB_SPEED_HIGH)
                                         ? (INTERRUPT_RATE << 3)
                                         : INTERRUPT_RATE,
-                                sg, nents, 0, SLAB_KERNEL);
+                                sg, nents, 0, GFP_KERNEL);
                 
                 if (retval)
                         break;
@@ -855,7 +855,7 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
          * as with bulk/intr sglists, sglen is the queue depth; it also
          * controls which subtests run (more tests than sglen) or rerun.
          */
-        urb = kcalloc(param->sglen, sizeof(struct urb *), SLAB_KERNEL);
+        urb = kcalloc(param->sglen, sizeof(struct urb *), GFP_KERNEL);
         if (!urb)
                 return -ENOMEM;
         for (i = 0; i < param->sglen; i++) {
@@ -981,7 +981,7 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
                 if (!u)
                         goto cleanup;
 
-                reqp = usb_buffer_alloc (udev, sizeof *reqp, SLAB_KERNEL,
+                reqp = usb_buffer_alloc (udev, sizeof *reqp, GFP_KERNEL,
                                 &u->setup_dma);
                 if (!reqp)
                         goto cleanup;
@@ -1067,7 +1067,7 @@ static int unlink1 (struct usbtest_dev *dev, int pipe, int size, int async)
          * FIXME want additional tests for when endpoint is STALLing
          * due to errors, or is just NAKing requests.
          */
-        if ((retval = usb_submit_urb (urb, SLAB_KERNEL)) != 0) {
+        if ((retval = usb_submit_urb (urb, GFP_KERNEL)) != 0) {
                 dev_dbg (&dev->intf->dev, "submit fail %d\n", retval);
                 return retval;
         }
@@ -1251,7 +1251,7 @@ static int ctrl_out (struct usbtest_dev *dev,
         if (length < 1 || length > 0xffff || vary >= length)
                 return -EINVAL;
 
-        buf = kmalloc(length, SLAB_KERNEL);
+        buf = kmalloc(length, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
 
@@ -1403,7 +1403,7 @@ static struct urb *iso_alloc_urb (
         maxp *= 1 + (0x3 & (le16_to_cpu(desc->wMaxPacketSize) >> 11));
         packets = (bytes + maxp - 1) / maxp;
 
-        urb = usb_alloc_urb (packets, SLAB_KERNEL);
+        urb = usb_alloc_urb (packets, GFP_KERNEL);
         if (!urb)
                 return urb;
         urb->dev = udev;
@@ -1411,7 +1411,7 @@ static struct urb *iso_alloc_urb (
 
         urb->number_of_packets = packets;
         urb->transfer_buffer_length = bytes;
-        urb->transfer_buffer = usb_buffer_alloc (udev, bytes, SLAB_KERNEL,
+        urb->transfer_buffer = usb_buffer_alloc (udev, bytes, GFP_KERNEL,
                         &urb->transfer_dma);
         if (!urb->transfer_buffer) {
                 usb_free_urb (urb);
@@ -1900,7 +1900,7 @@ usbtest_probe (struct usb_interface *intf, const struct usb_device_id *id)
         }
 #endif
 
-        dev = kzalloc(sizeof(*dev), SLAB_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
         info = (struct usbtest_info *) id->driver_info;
@@ -1910,7 +1910,7 @@ usbtest_probe (struct usb_interface *intf, const struct usb_device_id *id)
         dev->intf = intf;
 
         /* cacheline-aligned scratch for i/o */
-        if ((dev->buf = kmalloc (TBUF_SIZE, SLAB_KERNEL)) == NULL) {
+        if ((dev->buf = kmalloc (TBUF_SIZE, GFP_KERNEL)) == NULL) {
                 kfree (dev);
                 return -ENOMEM;
         }
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c
index c2a28d88ef3c..99f26b3e502f 100644
--- a/drivers/usb/net/rndis_host.c
+++ b/drivers/usb/net/rndis_host.c
@@ -469,7 +469,7 @@ static void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
         struct rndis_halt       *halt;
 
         /* try to clear any rndis state/activity (no i/o from stack!) */
-        halt = kcalloc(1, sizeof *halt, SLAB_KERNEL);
+        halt = kcalloc(1, sizeof *halt, GFP_KERNEL);
         if (halt) {
                 halt->msg_type = RNDIS_MSG_HALT;
                 halt->msg_len = ccpu2(sizeof *halt);
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 327f97555679..6e39e9988259 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -179,9 +179,9 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf)
         period = max ((int) dev->status->desc.bInterval,
                 (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3);
 
-        buf = kmalloc (maxp, SLAB_KERNEL);
+        buf = kmalloc (maxp, GFP_KERNEL);
         if (buf) {
-                dev->interrupt = usb_alloc_urb (0, SLAB_KERNEL);
+                dev->interrupt = usb_alloc_urb (0, GFP_KERNEL);
                 if (!dev->interrupt) {
                         kfree (buf);
                         return -ENOMEM;