Commit b26c05a2 authored Mar 26, 2013 by Andrew Morton Committed by Greg Kroah-Hartman Mar 26, 2013

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 <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>

parent 7c00782b

drivers/staging/zcache/zcache-main.c

+0 −26

Original line number	Diff line number	Diff line
		@@ -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,