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

Commit cf89b85c authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Greg Hackmann
Browse files

UPSTREAM: zsmalloc: remove extra cond_resched() in __zs_compact 



(cherry-pick from commit 160a117f0864871ae1bab26554a985a1d2861afd)

Do not perform cond_resched() before the busy compaction loop in
__zs_compact(), because this loop does it when needed.

Bug: 25951511

Change-Id: I4a9588b8a3ca3e212c0bb3ec1fec91f9a0e2025a
Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 62371bc9

mm/zsmalloc.c

+0 −2
Original line number Diff line number Diff line
@@ -1711,8 +1711,6 @@ static unsigned long __zs_compact(struct zs_pool *pool, 
	struct page *dst_page = NULL;

	unsigned long nr_total_migrated = 0;



	cond_resched();



	spin_lock(&class->lock);

	while ((src_page = isolate_source_page(class))) {