diff options
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/btt.c | 6 | ||||
| -rw-r--r-- | drivers/nvdimm/nd_perf.c | 3 | ||||
| -rw-r--r-- | drivers/nvdimm/region_devs.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index afbefc5f49bc..b6bef092f8b8 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -539,8 +539,7 @@ static int btt_freelist_init(struct arena_info *arena) struct log_entry log_new; u32 i, map_entry, log_oldmap, log_newmap; - arena->freelist = kzalloc_objs(struct free_entry, arena->nfree, - GFP_KERNEL); + arena->freelist = kzalloc_objs(struct free_entry, arena->nfree); if (!arena->freelist) return -ENOMEM; @@ -733,8 +732,7 @@ static int btt_maplocks_init(struct arena_info *arena) { u32 i; - arena->map_locks = kzalloc_objs(struct aligned_lock, arena->nfree, - GFP_KERNEL); + arena->map_locks = kzalloc_objs(struct aligned_lock, arena->nfree); if (!arena->map_locks) return -ENOMEM; diff --git a/drivers/nvdimm/nd_perf.c b/drivers/nvdimm/nd_perf.c index 9bd8dff3d35a..e0b51438dc9b 100644 --- a/drivers/nvdimm/nd_perf.c +++ b/drivers/nvdimm/nd_perf.c @@ -195,8 +195,7 @@ static int create_cpumask_attr_group(struct nvdimm_pmu *nd_pmu) } /* Allocate memory for cpumask attribute group */ - nvdimm_pmu_cpumask_group = kzalloc_obj(*nvdimm_pmu_cpumask_group, - GFP_KERNEL); + nvdimm_pmu_cpumask_group = kzalloc_obj(*nvdimm_pmu_cpumask_group); if (!nvdimm_pmu_cpumask_group) { kfree(pmu_events_attr); kfree(attrs_group); diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index c1eebff582d9..e35c2e18518f 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -1005,8 +1005,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, } nd_region = - kzalloc_flex(*nd_region, mapping, ndr_desc->num_mappings, - GFP_KERNEL); + kzalloc_flex(*nd_region, mapping, ndr_desc->num_mappings); if (!nd_region) return NULL; |