Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f37ac12 authored by YiPing Xu's avatar YiPing Xu Committed by Vinayak Menon
Browse files

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: default avatarYiPing Xu <xuyiping@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Git-commit: a82cbf07131b56e7e51fbb008b82ef769af08790
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Change-Id: I332dc03f886d1e6547b0b59914046a7924405d1b
Signed-off-by: default avatarVinayak Menon <vinmenon@codeaurora.org>
parent eb5e4429

mm/zsmalloc.c

+3 −6
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ struct mapping_area { 
#endif

	char *vm_addr; /* address of kmap_atomic()'ed pages */

	enum zs_mapmode vm_mm; /* mapping mode */

	bool huge;

};



static int create_handle_cache(struct zs_pool *pool)
@@ -1127,11 +1126,9 @@ static void __zs_unmap_object(struct mapping_area *area, 
		goto out;



	buf = area->vm_buf;

	if (!area->huge) {

	buf = buf + ZS_HANDLE_SIZE;

	size -= ZS_HANDLE_SIZE;

	off += ZS_HANDLE_SIZE;

	}



	sizes[0] = PAGE_SIZE - off;

	sizes[1] = size - sizes[0];