1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 5ec4f5eb6b19..47f6a4e29b40 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -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);
@@ -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;