diff options
author | YiPing Xu <xuyiping@huawei.com> | 2016-03-17 17:20:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 18:09:34 -0400 |
commit | a82cbf07131b56e7e51fbb008b82ef769af08790 (patch) | |
tree | e8d944f2c179afec96117100733123bb9984f6d4 /mm/zsmalloc.c | |
parent | a1c0b1a074c0095492a956b4fe0067b74a82cfe3 (diff) |
zsmalloc: drop unused member 'mapping_area->huge'
When unmapping a huge class page in zs_unmap_object, the page will be
unmapped by kmap_atomic. the "!area->huge" branch in __zs_unmap_object
is alway true, and no code set "area->huge" now, so we can drop it.
Signed-off-by: YiPing Xu <xuyiping@huawei.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/zsmalloc.c')
-rw-r--r-- | mm/zsmalloc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 2d7c4c11fc63..43e4cbcce5af 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c | |||
@@ -281,7 +281,6 @@ struct mapping_area { | |||
281 | #endif | 281 | #endif |
282 | char *vm_addr; /* address of kmap_atomic()'ed pages */ | 282 | char *vm_addr; /* address of kmap_atomic()'ed pages */ |
283 | enum zs_mapmode vm_mm; /* mapping mode */ | 283 | enum zs_mapmode vm_mm; /* mapping mode */ |
284 | bool huge; | ||
285 | }; | 284 | }; |
286 | 285 | ||
287 | static int create_handle_cache(struct zs_pool *pool) | 286 | static int create_handle_cache(struct zs_pool *pool) |
@@ -1127,11 +1126,9 @@ static void __zs_unmap_object(struct mapping_area *area, | |||
1127 | goto out; | 1126 | goto out; |
1128 | 1127 | ||
1129 | buf = area->vm_buf; | 1128 | buf = area->vm_buf; |
1130 | if (!area->huge) { | 1129 | buf = buf + ZS_HANDLE_SIZE; |
1131 | buf = buf + ZS_HANDLE_SIZE; | 1130 | size -= ZS_HANDLE_SIZE; |
1132 | size -= ZS_HANDLE_SIZE; | 1131 | off += ZS_HANDLE_SIZE; |
1133 | off += ZS_HANDLE_SIZE; | ||
1134 | } | ||
1135 | 1132 | ||
1136 | sizes[0] = PAGE_SIZE - off; | 1133 | sizes[0] = PAGE_SIZE - off; |
1137 | sizes[1] = size - sizes[0]; | 1134 | sizes[1] = size - sizes[0]; |