Hi Greg, When do you merge this series? Thanks. On Wed, Jul 18, 2012 at 11:55:54AM -0500, Seth Jennings wrote: > 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: Seth Jennings <sjenning@xxxxxxxxxxxxxxxxxx> > --- > drivers/staging/zsmalloc/zsmalloc-main.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c > index 8b0bcb6..3c83c65 100644 > --- a/drivers/staging/zsmalloc/zsmalloc-main.c > +++ b/drivers/staging/zsmalloc/zsmalloc-main.c > @@ -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; > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Kind regards, Minchan Kim _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel