From: Andrew Morton Date: Tue, 26 Mar 2013 21:58:14 +0000 (-0700) Subject: drivers/staging/zcache/zcache-main.c: fix build X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b26c05a207de3a2f84f1e084ad47a55a2d8e6fb0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drivers/staging/zcache/zcache-main.c: fix build flush_dcache_page() takes a page*, not a void*. It breaks ia64. Remove this and another unused function. Warnings remain: drivers/staging/zcache/zcache-main.c: In function '__check_disable_cleancache': drivers/staging/zcache/zcache-main.c:1837: warning: return from incompatible pointer type drivers/staging/zcache/zcache-main.c: In function '__check_disable_frontswap': drivers/staging/zcache/zcache-main.c:1838: warning: return from incompatible pointer type drivers/staging/zcache/zcache-main.c: In function '__check_disable_frontswap_ignore_nonactive': drivers/staging/zcache/zcache-main.c:1842: warning: return from incompatible pointer type Cc: Dan Magenheimer Cc: Konrad Rzeszutek Wilk Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 86ead8d96796..7a6dd966931b 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -277,32 +277,6 @@ static void zcache_obj_free(struct tmem_obj *obj, struct tmem_pool *pool) kmem_cache_free(zcache_obj_cache, obj); } -static bool page_is_zero_filled(void *ptr) -{ - unsigned int pos; - unsigned long *page; - - page = (unsigned long *)ptr; - - for (pos = 0; pos < PAGE_SIZE / sizeof(*page); pos++) { - if (page[pos]) - return false; - } - - return true; -} - -static void handle_zero_filled_page(void *page) -{ - void *user_mem; - - user_mem = kmap_atomic(page); - memset(user_mem, 0, PAGE_SIZE); - kunmap_atomic(user_mem); - - flush_dcache_page(page); -} - static struct tmem_hostops zcache_hostops = { .obj_alloc = zcache_obj_alloc, .obj_free = zcache_obj_free,