aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/mthca/mthca_memfree.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_memfree.c')
-rw-r--r--drivers/infiniband/hw/mthca/mthca_memfree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 2fe503e86c1d..7a31be3c3e73 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -367,7 +367,7 @@ struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev,
367 obj_per_chunk = MTHCA_TABLE_CHUNK_SIZE / obj_size; 367 obj_per_chunk = MTHCA_TABLE_CHUNK_SIZE / obj_size;
368 num_icm = DIV_ROUND_UP(nobj, obj_per_chunk); 368 num_icm = DIV_ROUND_UP(nobj, obj_per_chunk);
369 369
370 table = kmalloc(sizeof *table + num_icm * sizeof *table->icm, GFP_KERNEL); 370 table = kmalloc(struct_size(table, icm, num_icm), GFP_KERNEL);
371 if (!table) 371 if (!table)
372 return NULL; 372 return NULL;
373 373
@@ -529,7 +529,7 @@ struct mthca_user_db_table *mthca_init_user_db_tab(struct mthca_dev *dev)
529 return NULL; 529 return NULL;
530 530
531 npages = dev->uar_table.uarc_size / MTHCA_ICM_PAGE_SIZE; 531 npages = dev->uar_table.uarc_size / MTHCA_ICM_PAGE_SIZE;
532 db_tab = kmalloc(sizeof *db_tab + npages * sizeof *db_tab->page, GFP_KERNEL); 532 db_tab = kmalloc(struct_size(db_tab, page, npages), GFP_KERNEL);
533 if (!db_tab) 533 if (!db_tab)
534 return ERR_PTR(-ENOMEM); 534 return ERR_PTR(-ENOMEM);
535 535