From 551c23cea8db902e51070791fe22ea5f4235480d Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 18 Jul 2012 11:55:54 -0500 Subject: [PATCH] --- yaml --- r: 324509 b: refs/heads/master c: 6539a36c0cb9ec7f1c1633b535ac83b2bdf0ae6d h: refs/heads/master i: 324507: 59c76af3550972272aa1757dd5a79dc4504fad41 v: v3 --- [refs] | 2 +- trunk/drivers/staging/zsmalloc/zsmalloc-main.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2d1c12fcbbe1..caee4525d3ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ebb56d974b2c0b31effd1bb2bde554582a9ebd8 +refs/heads/master: 6539a36c0cb9ec7f1c1633b535ac83b2bdf0ae6d diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c index 8b0bcb626a7f..3c83c65ca5b8 100644 --- a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/trunk/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;