summaryrefslogtreecommitdiff
path: root/drivers/staging/zsmalloc/zsmalloc.h
diff options
context:
space:
mode:
authorMinchan Kim <minchan@kernel.org>2012-06-08 06:39:25 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-11 15:57:47 (GMT)
commitc234434835b1f4bad9bdbae6710044cba387c9e5 (patch)
tree818f9f981e1031f5e2b4f6be35f49faf83db729a /drivers/staging/zsmalloc/zsmalloc.h
parentb5b86a4d99f48e5ac28c19ae2a00415e26a7ac1a (diff)
downloadlinux-fsl-qoriq-c234434835b1f4bad9bdbae6710044cba387c9e5.tar.xz
staging: zsmalloc: zsmalloc: use unsigned long instead of void *
We should use unsigned long as handle instead of void * to avoid any confusion. Without this, users may just treat zs_malloc return value as a pointer and try to deference it. This patch passed compile test(zram, zcache and ramster) and zram is tested on qemu. changelog * from v2 - remove hval pointed out by Nitin - based on next-20120607 * from v1 - change zcache's zv_create return value - baesd on next-20120604 Cc: Dan Magenheimer <dan.magenheimer@oracle.com> Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Minchan Kim <minchan@kernel.org> Acked-by: Nitin Gupta <ngupta@vflare.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/zsmalloc/zsmalloc.h')
-rw-r--r--drivers/staging/zsmalloc/zsmalloc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/zsmalloc/zsmalloc.h b/drivers/staging/zsmalloc/zsmalloc.h
index 949384e..485cbb1 100644
--- a/drivers/staging/zsmalloc/zsmalloc.h
+++ b/drivers/staging/zsmalloc/zsmalloc.h
@@ -20,11 +20,11 @@ struct zs_pool;
struct zs_pool *zs_create_pool(const char *name, gfp_t flags);
void zs_destroy_pool(struct zs_pool *pool);
-void *zs_malloc(struct zs_pool *pool, size_t size);
-void zs_free(struct zs_pool *pool, void *obj);
+unsigned long zs_malloc(struct zs_pool *pool, size_t size);
+void zs_free(struct zs_pool *pool, unsigned long obj);
-void *zs_map_object(struct zs_pool *pool, void *handle);
-void zs_unmap_object(struct zs_pool *pool, void *handle);
+void *zs_map_object(struct zs_pool *pool, unsigned long handle);
+void zs_unmap_object(struct zs_pool *pool, unsigned long handle);
u64 zs_get_total_size_bytes(struct zs_pool *pool);