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

Commit 6539a36c authored by Seth Jennings's avatar Seth Jennings Committed by Greg Kroah-Hartman
Browse files

staging: zsmalloc: s/firstpage/page in new copy map funcs 



firstpage already has precedent and meaning the first page
of a zspage.  In the case of the copy mapping functions,
it is the first of a pair of pages needing to be mapped.

This patch just renames the firstpage argument to "page" to
avoid confusion.

Signed-off-by: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ebb56d9

drivers/staging/zsmalloc/zsmalloc-main.c

+6 −6
Original line number Diff line number Diff line
@@ -470,15 +470,15 @@ static struct page *find_get_zspage(struct size_class *class) 
	return page;

}



static void zs_copy_map_object(char *buf, struct page *firstpage,

static void zs_copy_map_object(char *buf, struct page *page,

				int off, int size)

{

	struct page *pages[2];

	int sizes[2];

	void *addr;



	pages[0] = firstpage;

	pages[1] = get_next_page(firstpage);

	pages[0] = page;

	pages[1] = get_next_page(page);

	BUG_ON(!pages[1]);



	sizes[0] = PAGE_SIZE - off;
@@ -493,15 +493,15 @@ static void zs_copy_map_object(char *buf, struct page *firstpage, 
	kunmap_atomic(addr);

}



static void zs_copy_unmap_object(char *buf, struct page *firstpage,

static void zs_copy_unmap_object(char *buf, struct page *page,

				int off, int size)

{

	struct page *pages[2];

	int sizes[2];

	void *addr;



	pages[0] = firstpage;

	pages[1] = get_next_page(firstpage);

	pages[0] = page;

	pages[1] = get_next_page(page);

	BUG_ON(!pages[1]);



	sizes[0] = PAGE_SIZE - off;