Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1724378
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 3.18 14/24] mm: cma: constify and use correct signness in mm/cma.c |
| Date | 2017-08-31 18:00 +0200 |
| Message-ID | <ukA2S-7ug-25@gated-at.bofh.it> (permalink) |
| References | <ukzTc-7qZ-19@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sasha Levin <sasha.levin@oracle.com>
commit ac173824959adeb489f9fcf88858774c4535a241 upstream.
Constify function parameters and use correct signness where needed.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
Cc: Pintu Kumar <pintu.k@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
include/linux/cma.h | 12 ++++++------
mm/cma.c | 24 ++++++++++++++----------
2 files changed, 20 insertions(+), 16 deletions(-)
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -16,16 +16,16 @@
struct cma;
extern unsigned long totalcma_pages;
-extern phys_addr_t cma_get_base(struct cma *cma);
-extern unsigned long cma_get_size(struct cma *cma);
+extern phys_addr_t cma_get_base(const struct cma *cma);
+extern unsigned long cma_get_size(const struct cma *cma);
extern int __init cma_declare_contiguous(phys_addr_t base,
phys_addr_t size, phys_addr_t limit,
phys_addr_t alignment, unsigned int order_per_bit,
bool fixed, struct cma **res_cma);
-extern int cma_init_reserved_mem(phys_addr_t base,
- phys_addr_t size, int order_per_bit,
+extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
+ unsigned int order_per_bit,
struct cma **res_cma);
-extern struct page *cma_alloc(struct cma *cma, int count, unsigned int align);
-extern bool cma_release(struct cma *cma, struct page *pages, int count);
+extern struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align);
+extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count);
#endif
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -47,17 +47,18 @@ static struct cma cma_areas[MAX_CMA_AREA
static unsigned cma_area_count;
static DEFINE_MUTEX(cma_mutex);
-phys_addr_t cma_get_base(struct cma *cma)
+phys_addr_t cma_get_base(const struct cma *cma)
{
return PFN_PHYS(cma->base_pfn);
}
-unsigned long cma_get_size(struct cma *cma)
+unsigned long cma_get_size(const struct cma *cma)
{
return cma->count << PAGE_SHIFT;
}
-static unsigned long cma_bitmap_aligned_mask(struct cma *cma, int align_order)
+static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,
+ int align_order)
{
if (align_order <= cma->order_per_bit)
return 0;
@@ -68,7 +69,8 @@ static unsigned long cma_bitmap_aligned_
* Find a PFN aligned to the specified order and return an offset represented in
* order_per_bits.
*/
-static unsigned long cma_bitmap_aligned_offset(struct cma *cma, int align_order)
+static unsigned long cma_bitmap_aligned_offset(const struct cma *cma,
+ int align_order)
{
if (align_order <= cma->order_per_bit)
return 0;
@@ -82,13 +84,14 @@ static unsigned long cma_bitmap_maxno(st
return cma->count >> cma->order_per_bit;
}
-static unsigned long cma_bitmap_pages_to_bits(struct cma *cma,
- unsigned long pages)
+static unsigned long cma_bitmap_pages_to_bits(const struct cma *cma,
+ unsigned long pages)
{
return ALIGN(pages, 1UL << cma->order_per_bit) >> cma->order_per_bit;
}
-static void cma_clear_bitmap(struct cma *cma, unsigned long pfn, int count)
+static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,
+ unsigned int count)
{
unsigned long bitmap_no, bitmap_count;
@@ -167,7 +170,8 @@ core_initcall(cma_init_reserved_areas);
* This function creates custom contiguous area from already reserved memory.
*/
int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
- int order_per_bit, struct cma **res_cma)
+ unsigned int order_per_bit,
+ struct cma **res_cma)
{
struct cma *cma;
phys_addr_t alignment;
@@ -359,7 +363,7 @@ err:
* This function allocates part of contiguous memory on specific
* contiguous memory area.
*/
-struct page *cma_alloc(struct cma *cma, int count, unsigned int align)
+struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align)
{
unsigned long mask, offset, pfn, start = 0;
unsigned long bitmap_maxno, bitmap_no, bitmap_count;
@@ -430,7 +434,7 @@ struct page *cma_alloc(struct cma *cma,
* It returns false when provided pages do not belong to contiguous area and
* true otherwise.
*/
-bool cma_release(struct cma *cma, struct page *pages, int count)
+bool cma_release(struct cma *cma, const struct page *pages, unsigned int count)
{
unsigned long pfn;
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 3.18 00/24] 3.18.69-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 15/24] mm: cma: fix incorrect type conversion for size during dma allocation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 11/24] mm: cma: split cma-reserved in dmesg log Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 05/24] gcov: support GCC 7.1 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 23/24] scsi: sg: reset res_in_use after unlinking reserved array Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 17/24] arm64: flush FP/SIMD state correctly after execve() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 19/24] x86-64: Handle PC-relative relocations on per-CPU data Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
[PATCH 3.18 02/24] ALSA: au88x0: Fix zero clear of stream->resources Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 18/24] arm64: fpsimd: Prevent registers leaking across exec Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 10/24] mm/cma: make kmemleak ignore CMA regions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 12/24] mm: cma: fix totalcma_pages to include DT defined CMA regions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 22/24] scsi: sg: protect accesses to reserved page array Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 03/24] gcov: add support for GCC 5.1 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 14/24] mm: cma: constify and use correct signness in mm/cma.c Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 09/24] mm: cma: align to physical address, not CMA region position Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 04/24] gcov: add support for gcc version >= 6 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
[PATCH 3.18 07/24] arm64: mm: abort uaccess retries upon fatal signal Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
Re: [PATCH 3.18 00/24] 3.18.69-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-08-31 21:10 +0200
Re: [PATCH 3.18 00/24] 3.18.69-stable review Guenter Roeck <linux@roeck-us.net> - 2017-08-31 21:40 +0200
Re: [PATCH 3.18 00/24] 3.18.69-stable review Guenter Roeck <linux@roeck-us.net> - 2017-09-01 04:40 +0200
Re: [PATCH 3.18 00/24] 3.18.69-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-01 07:10 +0200
csiph-web