2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 74c0eac083e4..32933ed54b8a 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -1032,9 +1032,9 @@ struct zfcp_data {
         wwn_t                   init_wwpn;
         fcp_lun_t               init_fcp_lun;
         char                    *driver_version;
-        kmem_cache_t            *fsf_req_qtcb_cache;
-        kmem_cache_t            *sr_buffer_cache;
-        kmem_cache_t            *gid_pn_cache;
+        struct kmem_cache               *fsf_req_qtcb_cache;
+        struct kmem_cache               *sr_buffer_cache;
+        struct kmem_cache               *gid_pn_cache;
 };
 
 /**
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 277826cdd0c8..067f1519eb04 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -109,7 +109,7 @@ zfcp_fsf_req_alloc(mempool_t *pool, int req_flags)
                         ptr = kmalloc(size, GFP_ATOMIC);
                 else
                         ptr = kmem_cache_alloc(zfcp_data.fsf_req_qtcb_cache,
-                                               SLAB_ATOMIC);
+                                               GFP_ATOMIC);
         }
 
         if (unlikely(!ptr))