From 4b9ff918b3c0e64d7bdce76f091f0ad2bfc84a57 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Thu, 3 May 2012 15:40:40 +0900 Subject: [PATCH] --- yaml --- r: 304557 b: refs/heads/master c: 00a61d8618bb7314113eb3ba27c12631cd85c298 h: refs/heads/master i: 304555: 20381d6802ea5b2ea59775bbea6f1de3f4df2f01 v: v3 --- [refs] | 2 +- trunk/drivers/staging/zsmalloc/zsmalloc-main.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cb32abc6158f..c9ac677a8fe3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e3b61547191a5934ff6c789aaa4d7e9a9e52f5a +refs/heads/master: 00a61d8618bb7314113eb3ba27c12631cd85c298 diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c index 86428000f88a..449673773286 100644 --- a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c @@ -566,13 +566,9 @@ EXPORT_SYMBOL_GPL(zs_destroy_pool); * zs_malloc - Allocate block of given size from pool. * @pool: pool to allocate from * @size: size of block to allocate - * @page: page no. that holds the object - * @offset: location of object within page - * - * On success, identifies block allocated - * and 0 is returned. On failure, is set to - * 0 and -ENOMEM is returned. * + * On success, handle to the allocated object is returned, + * otherwise NULL. * Allocation requests with size > ZS_MAX_ALLOC_SIZE will fail. */ void *zs_malloc(struct zs_pool *pool, size_t size) @@ -667,6 +663,15 @@ void zs_free(struct zs_pool *pool, void *obj) } EXPORT_SYMBOL_GPL(zs_free); +/** + * zs_map_object - get address of allocated object from handle. + * @pool: pool from which the object was allocated + * @handle: handle returned from zs_malloc + * + * Before using an object allocated from zs_malloc, it must be mapped using + * this function. When done with the object, it must be unmapped using + * zs_unmap_object +*/ void *zs_map_object(struct zs_pool *pool, void *handle) { struct page *page;