summaryrefslogtreecommitdiff
path: root/drivers/infiniband/core/multicast.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/infiniband/core/multicast.c')
-rw-r--r--drivers/infiniband/core/multicast.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index a236532a9026..bea7df3dd8f3 100644
--- a/drivers/infiniband/core/multicast.c
+++ b/drivers/infiniband/core/multicast.c
@@ -570,7 +570,7 @@ static struct mcast_group *acquire_group(struct mcast_port *port,
spin_unlock_irqrestore(&port->lock, flags);
}
- group = kzalloc(sizeof *group, gfp_mask);
+ group = kzalloc_obj(*group, gfp_mask);
if (!group)
return NULL;
@@ -621,7 +621,7 @@ ib_sa_join_multicast(struct ib_sa_client *client,
if (!dev)
return ERR_PTR(-ENODEV);
- member = kmalloc(sizeof *member, gfp_mask);
+ member = kmalloc_obj(*member, gfp_mask);
if (!member)
return ERR_PTR(-ENOMEM);
@@ -823,8 +823,7 @@ static int mcast_add_one(struct ib_device *device)
int i;
int count = 0;
- dev = kmalloc(struct_size(dev, port, device->phys_port_cnt),
- GFP_KERNEL);
+ dev = kmalloc_flex(*dev, port, device->phys_port_cnt);
if (!dev)
return -ENOMEM;