diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-25 01:09:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-25 01:09:47 -0800 |
| commit | 3a3889ab9e0e4d04452dc89b5a5e0449bf72f1e1 (patch) | |
| tree | 43a9b02b87ace4538750db02033f128cc629d5e4 /include/linux | |
| parent | 93ff358f0745175361e0c44c7af0491d4352ccd2 (diff) | |
| parent | 119756c9c0ea107e1f40f7e9a89dbbf97c7a0b61 (diff) | |
Merge "zsmalloc: require GFP in zs_malloc()"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/zsmalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index 34eb16098a33..57a8e98f2708 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -41,10 +41,10 @@ struct zs_pool_stats { struct zs_pool; -struct zs_pool *zs_create_pool(const char *name, gfp_t flags); +struct zs_pool *zs_create_pool(const char *name); void zs_destroy_pool(struct zs_pool *pool); -unsigned long zs_malloc(struct zs_pool *pool, size_t size); +unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags); void zs_free(struct zs_pool *pool, unsigned long obj); void *zs_map_object(struct zs_pool *pool, unsigned long handle, |