Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99eef8e9 authored by Dan Streetman's avatar Dan Streetman Committed by Linus Torvalds
Browse files

mm/zbud: change zbud_alloc size type to size_t 



Change the type of the zbud_alloc() size param from unsigned int to
size_t.

Technically, this should not make any difference, as the zbud
implementation already restricts the size to well within either type's
limits; but as zsmalloc (and kmalloc) use size_t, and zpool will use
size_t, this brings the size parameter type in line with zsmalloc/zpool.

Signed-off-by: default avatarDan Streetman <ddstreet@ieee.org>
Acked-by: default avatarSeth Jennings <sjennings@variantweb.net>
Tested-by: default avatarSeth Jennings <sjennings@variantweb.net>
Cc: Weijie Yang <weijie.yang@samsung.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2d5e762

include/linux/zbud.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ struct zbud_ops { 




struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops);

struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops);

void zbud_destroy_pool(struct zbud_pool *pool);

void zbud_destroy_pool(struct zbud_pool *pool);

int zbud_alloc(struct zbud_pool *pool, unsigned int size, gfp_t gfp,

int zbud_alloc(struct zbud_pool *pool, size_t size, gfp_t gfp,

	unsigned long *handle);

	unsigned long *handle);

void zbud_free(struct zbud_pool *pool, unsigned long handle);

void zbud_free(struct zbud_pool *pool, unsigned long handle);

int zbud_reclaim_page(struct zbud_pool *pool, unsigned int retries);

int zbud_reclaim_page(struct zbud_pool *pool, unsigned int retries);

mm/zbud.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ enum buddy { 
};

};





/* Converts an allocation size in bytes to size in zbud chunks */

/* Converts an allocation size in bytes to size in zbud chunks */

static int size_to_chunks(int size)

static int size_to_chunks(size_t size)

{

{

	return (size + CHUNK_SIZE - 1) >> CHUNK_SHIFT;

	return (size + CHUNK_SIZE - 1) >> CHUNK_SHIFT;

}

}
@@ -247,7 +247,7 @@ void zbud_destroy_pool(struct zbud_pool *pool) 
 * gfp arguments are invalid or -ENOMEM if the pool was unable to allocate

 * gfp arguments are invalid or -ENOMEM if the pool was unable to allocate

 * a new page.

 * a new page.

 */

 */

int zbud_alloc(struct zbud_pool *pool, unsigned int size, gfp_t gfp,

int zbud_alloc(struct zbud_pool *pool, size_t size, gfp_t gfp,

			unsigned long *handle)

			unsigned long *handle)

{

{

	int chunks, i, freechunks;

	int chunks, i, freechunks;