6 files changed, 28 insertions, 27 deletions

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 31e5cc49d61a..27d6c642415d 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -133,7 +133,7 @@ struct eth1394_node_info {
 #define ETH1394_DRIVER_NAME "eth1394"
 static const char driver_name[] = ETH1394_DRIVER_NAME;
 
-static kmem_cache_t *packet_task_cache;
+static struct kmem_cache *packet_task_cache;
 
 static struct hpsb_highlevel eth1394_highlevel;
 
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/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 8e7b83f84485..e829c9336b3c 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/moduleparam.h>
+#include <linux/freezer.h>
 #include <asm/atomic.h>
 
 #include "csr.h"
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 5ec4f5eb6b19..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)
@@ -259,7 +259,7 @@ static void host_reset(struct hpsb_host *host)
         if (hi != NULL) {
                 list_for_each_entry(fi, &hi->file_info_list, list) {
                         if (fi->notification == RAW1394_NOTIFY_ON) {
-                                req = __alloc_pending_request(SLAB_ATOMIC);
+                                req = __alloc_pending_request(GFP_ATOMIC);
 
                                 if (req != NULL) {
                                         req->file_info = fi;
@@ -306,13 +306,13 @@ static void iso_receive(struct hpsb_host *host, int channel, quadlet_t * data,
                         if (!(fi->listen_channels & (1ULL << channel)))
                                 continue;
 
-                        req = __alloc_pending_request(SLAB_ATOMIC);
+                        req = __alloc_pending_request(GFP_ATOMIC);
                         if (!req)
                                 break;
 
                         if (!ibs) {
                                 ibs = kmalloc(sizeof(*ibs) + length,
-                                              SLAB_ATOMIC);
+                                              GFP_ATOMIC);
                                 if (!ibs) {
                                         kfree(req);
                                         break;
@@ -367,13 +367,13 @@ static void fcp_request(struct hpsb_host *host, int nodeid, int direction,
                         if (!fi->fcp_buffer)
                                 continue;
 
-                        req = __alloc_pending_request(SLAB_ATOMIC);
+                        req = __alloc_pending_request(GFP_ATOMIC);
                         if (!req)
                                 break;
 
                         if (!ibs) {
                                 ibs = kmalloc(sizeof(*ibs) + length,
-                                              SLAB_ATOMIC);
+                                              GFP_ATOMIC);
                                 if (!ibs) {
                                         kfree(req);
                                         break;
@@ -593,7 +593,7 @@ static int state_initialized(struct file_info *fi, struct pending_request *req)
         switch (req->req.type) {
         case RAW1394_REQ_LIST_CARDS:
                 spin_lock_irqsave(&host_info_lock, flags);
-                khl = kmalloc(sizeof(*khl) * host_count, SLAB_ATOMIC);
+                khl = kmalloc(sizeof(*khl) * host_count, GFP_ATOMIC);
 
                 if (khl) {
                         req->req.misc = host_count;
@@ -1045,7 +1045,7 @@ static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer,
         }
         if (arm_addr->notification_options & ARM_READ) {
                 DBGMSG("arm_read -> entering notification-section");
-                req = __alloc_pending_request(SLAB_ATOMIC);
+                req = __alloc_pending_request(GFP_ATOMIC);
                 if (!req) {
                         DBGMSG("arm_read -> rcode_conflict_error");
                         spin_unlock_irqrestore(&host_info_lock, irqflags);
@@ -1064,7 +1064,7 @@ static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer,
                             sizeof(struct arm_response) +
                             sizeof(struct arm_request_response);
                 }
-                req->data = kmalloc(size, SLAB_ATOMIC);
+                req->data = kmalloc(size, GFP_ATOMIC);
                 if (!(req->data)) {
                         free_pending_request(req);
                         DBGMSG("arm_read -> rcode_conflict_error");
@@ -1198,7 +1198,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
         }
         if (arm_addr->notification_options & ARM_WRITE) {
                 DBGMSG("arm_write -> entering notification-section");
-                req = __alloc_pending_request(SLAB_ATOMIC);
+                req = __alloc_pending_request(GFP_ATOMIC);
                 if (!req) {
                         DBGMSG("arm_write -> rcode_conflict_error");
                         spin_unlock_irqrestore(&host_info_lock, irqflags);
@@ -1209,7 +1209,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
                     sizeof(struct arm_request) + sizeof(struct arm_response) +
                     (length) * sizeof(byte_t) +
                     sizeof(struct arm_request_response);
-                req->data = kmalloc(size, SLAB_ATOMIC);
+                req->data = kmalloc(size, GFP_ATOMIC);
                 if (!(req->data)) {
                         free_pending_request(req);
                         DBGMSG("arm_write -> rcode_conflict_error");
@@ -1400,7 +1400,7 @@ static int arm_lock(struct hpsb_host *host, int nodeid, quadlet_t * store,
         if (arm_addr->notification_options & ARM_LOCK) {
                 byte_t *buf1, *buf2;
                 DBGMSG("arm_lock -> entering notification-section");
-                req = __alloc_pending_request(SLAB_ATOMIC);
+                req = __alloc_pending_request(GFP_ATOMIC);
                 if (!req) {
                         DBGMSG("arm_lock -> rcode_conflict_error");
                         spin_unlock_irqrestore(&host_info_lock, irqflags);
@@ -1408,7 +1408,7 @@ static int arm_lock(struct hpsb_host *host, int nodeid, quadlet_t * store,
                                                            The request may be retried */
                 }
                 size = sizeof(struct arm_request) + sizeof(struct arm_response) + 3 * sizeof(*store) + sizeof(struct arm_request_response);     /* maximum */
-                req->data = kmalloc(size, SLAB_ATOMIC);
+                req->data = kmalloc(size, GFP_ATOMIC);
                 if (!(req->data)) {
                         free_pending_request(req);
                         DBGMSG("arm_lock -> rcode_conflict_error");
@@ -1628,7 +1628,7 @@ static int arm_lock64(struct hpsb_host *host, int nodeid, octlet_t * store,
         if (arm_addr->notification_options & ARM_LOCK) {
                 byte_t *buf1, *buf2;
                 DBGMSG("arm_lock64 -> entering notification-section");
-                req = __alloc_pending_request(SLAB_ATOMIC);
+                req = __alloc_pending_request(GFP_ATOMIC);
                 if (!req) {
                         spin_unlock_irqrestore(&host_info_lock, irqflags);
                         DBGMSG("arm_lock64 -> rcode_conflict_error");
@@ -1636,7 +1636,7 @@ static int arm_lock64(struct hpsb_host *host, int nodeid, octlet_t * store,
                                                            The request may be retried */
                 }
                 size = sizeof(struct arm_request) + sizeof(struct arm_response) + 3 * sizeof(*store) + sizeof(struct arm_request_response);     /* maximum */
-                req->data = kmalloc(size, SLAB_ATOMIC);
+                req->data = kmalloc(size, GFP_ATOMIC);
                 if (!(req->data)) {
                         free_pending_request(req);
                         spin_unlock_irqrestore(&host_info_lock, irqflags);
@@ -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)) {
@@ -2443,7 +2443,7 @@ static void queue_rawiso_event(struct file_info *fi)
         /* only one ISO activity event may be in the queue */
         if (!__rawiso_event_in_queue(fi)) {
                 struct pending_request *req =
-                    __alloc_pending_request(SLAB_ATOMIC);
+                    __alloc_pending_request(GFP_ATOMIC);
 
                 if (req) {
                         req->file_info = fi;
@@ -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;