diff --git a/[refs] b/[refs] index 796be393a0e4..d4458693a638 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c00782b1d4b9073ae38891d636302b1267285af +refs/heads/master: b26c05a207de3a2f84f1e084ad47a55a2d8e6fb0 diff --git a/trunk/drivers/staging/zcache/zcache-main.c b/trunk/drivers/staging/zcache/zcache-main.c index 86ead8d96796..7a6dd966931b 100644 --- a/trunk/drivers/staging/zcache/zcache-main.c +++ b/trunk/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,