drivers/staging/zcache/zcache-main.c: fix build
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 26 Mar 2013 21:58:14 +0000 (14:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 23:17:54 +0000 (16:17 -0700)
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 <dan.magenheimer@oracle.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/zcache/zcache-main.c

index 86ead8d..7a6dd96 100644 (file)
@@ -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,