diff options
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/core/mad.c | 1 | ||||
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_vq.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_av.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_cq.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_main.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_mrmw.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_pd.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_qp.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 2 |
9 files changed, 9 insertions, 10 deletions
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index 6b8faca02f8a..bc547f1d34ba 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c | |||
@@ -2998,7 +2998,6 @@ static int __init ib_mad_init_module(void) | |||
2998 | sizeof(struct ib_mad_private), | 2998 | sizeof(struct ib_mad_private), |
2999 | 0, | 2999 | 0, |
3000 | SLAB_HWCACHE_ALIGN, | 3000 | SLAB_HWCACHE_ALIGN, |
3001 | NULL, | ||
3002 | NULL); | 3001 | NULL); |
3003 | if (!ib_mad_cache) { | 3002 | if (!ib_mad_cache) { |
3004 | printk(KERN_ERR PFX "Couldn't create ib_mad cache\n"); | 3003 | printk(KERN_ERR PFX "Couldn't create ib_mad cache\n"); |
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c index 36620a22413c..cfdacb1ec279 100644 --- a/drivers/infiniband/hw/amso1100/c2_vq.c +++ b/drivers/infiniband/hw/amso1100/c2_vq.c | |||
@@ -85,7 +85,7 @@ int vq_init(struct c2_dev *c2dev) | |||
85 | (char) ('0' + c2dev->devnum)); | 85 | (char) ('0' + c2dev->devnum)); |
86 | c2dev->host_msg_cache = | 86 | c2dev->host_msg_cache = |
87 | kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0, | 87 | kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0, |
88 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 88 | SLAB_HWCACHE_ALIGN, NULL); |
89 | if (c2dev->host_msg_cache == NULL) { | 89 | if (c2dev->host_msg_cache == NULL) { |
90 | return -ENOMEM; | 90 | return -ENOMEM; |
91 | } | 91 | } |
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c index e53a97af1260..97d108634c58 100644 --- a/drivers/infiniband/hw/ehca/ehca_av.c +++ b/drivers/infiniband/hw/ehca/ehca_av.c | |||
@@ -259,7 +259,7 @@ int ehca_init_av_cache(void) | |||
259 | av_cache = kmem_cache_create("ehca_cache_av", | 259 | av_cache = kmem_cache_create("ehca_cache_av", |
260 | sizeof(struct ehca_av), 0, | 260 | sizeof(struct ehca_av), 0, |
261 | SLAB_HWCACHE_ALIGN, | 261 | SLAB_HWCACHE_ALIGN, |
262 | NULL, NULL); | 262 | NULL); |
263 | if (!av_cache) | 263 | if (!av_cache) |
264 | return -ENOMEM; | 264 | return -ENOMEM; |
265 | return 0; | 265 | return 0; |
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c index 9e87883b561a..1e8ca3fca4aa 100644 --- a/drivers/infiniband/hw/ehca/ehca_cq.c +++ b/drivers/infiniband/hw/ehca/ehca_cq.c | |||
@@ -387,7 +387,7 @@ int ehca_init_cq_cache(void) | |||
387 | cq_cache = kmem_cache_create("ehca_cache_cq", | 387 | cq_cache = kmem_cache_create("ehca_cache_cq", |
388 | sizeof(struct ehca_cq), 0, | 388 | sizeof(struct ehca_cq), 0, |
389 | SLAB_HWCACHE_ALIGN, | 389 | SLAB_HWCACHE_ALIGN, |
390 | NULL, NULL); | 390 | NULL); |
391 | if (!cq_cache) | 391 | if (!cq_cache) |
392 | return -ENOMEM; | 392 | return -ENOMEM; |
393 | return 0; | 393 | return 0; |
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index 36377c6db3d4..04c324330b7c 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c | |||
@@ -163,7 +163,7 @@ static int ehca_create_slab_caches(void) | |||
163 | ctblk_cache = kmem_cache_create("ehca_cache_ctblk", | 163 | ctblk_cache = kmem_cache_create("ehca_cache_ctblk", |
164 | EHCA_PAGESIZE, H_CB_ALIGNMENT, | 164 | EHCA_PAGESIZE, H_CB_ALIGNMENT, |
165 | SLAB_HWCACHE_ALIGN, | 165 | SLAB_HWCACHE_ALIGN, |
166 | NULL, NULL); | 166 | NULL); |
167 | if (!ctblk_cache) { | 167 | if (!ctblk_cache) { |
168 | ehca_gen_err("Cannot create ctblk SLAB cache."); | 168 | ehca_gen_err("Cannot create ctblk SLAB cache."); |
169 | ehca_cleanup_mrmw_cache(); | 169 | ehca_cleanup_mrmw_cache(); |
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index 6262c5462d50..9f4c9d46e8ef 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c | |||
@@ -1950,13 +1950,13 @@ int ehca_init_mrmw_cache(void) | |||
1950 | mr_cache = kmem_cache_create("ehca_cache_mr", | 1950 | mr_cache = kmem_cache_create("ehca_cache_mr", |
1951 | sizeof(struct ehca_mr), 0, | 1951 | sizeof(struct ehca_mr), 0, |
1952 | SLAB_HWCACHE_ALIGN, | 1952 | SLAB_HWCACHE_ALIGN, |
1953 | NULL, NULL); | 1953 | NULL); |
1954 | if (!mr_cache) | 1954 | if (!mr_cache) |
1955 | return -ENOMEM; | 1955 | return -ENOMEM; |
1956 | mw_cache = kmem_cache_create("ehca_cache_mw", | 1956 | mw_cache = kmem_cache_create("ehca_cache_mw", |
1957 | sizeof(struct ehca_mw), 0, | 1957 | sizeof(struct ehca_mw), 0, |
1958 | SLAB_HWCACHE_ALIGN, | 1958 | SLAB_HWCACHE_ALIGN, |
1959 | NULL, NULL); | 1959 | NULL); |
1960 | if (!mw_cache) { | 1960 | if (!mw_cache) { |
1961 | kmem_cache_destroy(mr_cache); | 1961 | kmem_cache_destroy(mr_cache); |
1962 | mr_cache = NULL; | 1962 | mr_cache = NULL; |
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c index 79d0591a8043..c85312ad292b 100644 --- a/drivers/infiniband/hw/ehca/ehca_pd.c +++ b/drivers/infiniband/hw/ehca/ehca_pd.c | |||
@@ -100,7 +100,7 @@ int ehca_init_pd_cache(void) | |||
100 | pd_cache = kmem_cache_create("ehca_cache_pd", | 100 | pd_cache = kmem_cache_create("ehca_cache_pd", |
101 | sizeof(struct ehca_pd), 0, | 101 | sizeof(struct ehca_pd), 0, |
102 | SLAB_HWCACHE_ALIGN, | 102 | SLAB_HWCACHE_ALIGN, |
103 | NULL, NULL); | 103 | NULL); |
104 | if (!pd_cache) | 104 | if (!pd_cache) |
105 | return -ENOMEM; | 105 | return -ENOMEM; |
106 | return 0; | 106 | return 0; |
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c index 48e9ceacd6fa..a3146e696c5d 100644 --- a/drivers/infiniband/hw/ehca/ehca_qp.c +++ b/drivers/infiniband/hw/ehca/ehca_qp.c | |||
@@ -1760,7 +1760,7 @@ int ehca_init_qp_cache(void) | |||
1760 | qp_cache = kmem_cache_create("ehca_cache_qp", | 1760 | qp_cache = kmem_cache_create("ehca_cache_qp", |
1761 | sizeof(struct ehca_qp), 0, | 1761 | sizeof(struct ehca_qp), 0, |
1762 | SLAB_HWCACHE_ALIGN, | 1762 | SLAB_HWCACHE_ALIGN, |
1763 | NULL, NULL); | 1763 | NULL); |
1764 | if (!qp_cache) | 1764 | if (!qp_cache) |
1765 | return -ENOMEM; | 1765 | return -ENOMEM; |
1766 | return 0; | 1766 | return 0; |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index effdee299b0c..5db314380271 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
@@ -637,7 +637,7 @@ static int __init iser_init(void) | |||
637 | ig.desc_cache = kmem_cache_create("iser_descriptors", | 637 | ig.desc_cache = kmem_cache_create("iser_descriptors", |
638 | sizeof (struct iser_desc), | 638 | sizeof (struct iser_desc), |
639 | 0, SLAB_HWCACHE_ALIGN, | 639 | 0, SLAB_HWCACHE_ALIGN, |
640 | NULL, NULL); | 640 | NULL); |
641 | if (ig.desc_cache == NULL) | 641 | if (ig.desc_cache == NULL) |
642 | return -ENOMEM; | 642 | return -ENOMEM; |
643 | 643 | ||