Skip to content

Commit

Permalink
mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation
Browse files Browse the repository at this point in the history
kzalloc() is used for cma bitmap allocation in cma_activate_area(),
switch to bitmap_zalloc() for clarity.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Yunfeng Ye <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Yue Hu <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Andrey Ryabinin <[email protected]>
Cc: Ryohei Suzuki <[email protected]>
Cc: Andrey Konovalov <[email protected]>
Cc: Doug Berger <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
yeyunfeng-dev authored and torvalds committed Dec 1, 2019
1 parent 75f3606 commit 2184f99
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions mm/cma.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,11 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,

static int __init cma_activate_area(struct cma *cma)
{
int bitmap_size = BITS_TO_LONGS(cma_bitmap_maxno(cma)) * sizeof(long);
unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;
unsigned i = cma->count >> pageblock_order;
struct zone *zone;

cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);

cma->bitmap = bitmap_zalloc(cma_bitmap_maxno(cma), GFP_KERNEL);
if (!cma->bitmap) {
cma->count = 0;
return -ENOMEM;
Expand Down Expand Up @@ -139,7 +137,7 @@ static int __init cma_activate_area(struct cma *cma)

not_in_zone:
pr_err("CMA area %s could not be activated\n", cma->name);
kfree(cma->bitmap);
bitmap_free(cma->bitmap);
cma->count = 0;
return -EINVAL;
}
Expand Down

0 comments on commit 2184f99

Please sign in to comment.