diff options
author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:03:41 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:03:41 +0800 |
commit | 9cebd248bd83dea5ead3f1ab5f3cbaf241588e37 (patch) | |
tree | 5f2d8fd7122c345045c476d57cb7c5ad17a4f08b /mm/cma.c | |
parent | 4f0ca2b2718d297c88b1c303f2d414327c537636 (diff) | |
parent | 6c6f924f9c6294944ee6efb1bbd8cdb853582e50 (diff) |
Merge tag 'v4.9.79' into linux-linaro-lsk-v4.9lsk-v4.9-18.02
This is the 4.9.79 stable release
Diffstat (limited to 'mm/cma.c')
-rw-r--r-- | mm/cma.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -54,7 +54,7 @@ unsigned long cma_get_size(const struct cma *cma) } static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, - int align_order) + unsigned int align_order) { if (align_order <= cma->order_per_bit) return 0; @@ -62,17 +62,14 @@ static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, } /* - * Find a PFN aligned to the specified order and return an offset represented in - * order_per_bits. + * Find the offset of the base PFN from the specified align_order. + * The value returned is represented in order_per_bits. */ static unsigned long cma_bitmap_aligned_offset(const struct cma *cma, - int align_order) + unsigned int align_order) { - if (align_order <= cma->order_per_bit) - return 0; - - return (ALIGN(cma->base_pfn, (1UL << align_order)) - - cma->base_pfn) >> cma->order_per_bit; + return (cma->base_pfn & ((1UL << align_order) - 1)) + >> cma->order_per_bit; } static unsigned long cma_bitmap_pages_to_bits(const struct cma *cma, |