diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-25 01:09:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-25 01:09:47 -0800 |
| commit | 93ff358f0745175361e0c44c7af0491d4352ccd2 (patch) | |
| tree | 2ba69738802c05fb1a2645eca7e6c9b714e24754 | |
| parent | 910517fc58c0fff590826df759262dcfba81c473 (diff) | |
| parent | 7c8378f96e35f873717b3ced411d40211aea484d (diff) | |
Merge "zsmalloc: remove unused pool param in obj_free"
| -rw-r--r-- | mm/zsmalloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 18535abfad40..ae288c9f7156 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1438,8 +1438,7 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size) } EXPORT_SYMBOL_GPL(zs_malloc); -static void obj_free(struct zs_pool *pool, struct size_class *class, - unsigned long obj) +static void obj_free(struct size_class *class, unsigned long obj) { struct link_free *link; struct page *first_page, *f_page; @@ -1485,7 +1484,7 @@ void zs_free(struct zs_pool *pool, unsigned long handle) class = pool->size_class[class_idx]; spin_lock(&class->lock); - obj_free(pool, class, obj); + obj_free(class, obj); fullness = fix_fullness_group(class, first_page); if (fullness == ZS_EMPTY) { zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage( @@ -1648,7 +1647,7 @@ static int migrate_zspage(struct zs_pool *pool, struct size_class *class, free_obj |= BIT(HANDLE_PIN_BIT); record_obj(handle, free_obj); unpin_tag(handle); - obj_free(pool, class, used_obj); + obj_free(class, used_obj); } /* Remember last position in this iteration */ |