* [merged] mm-zsmalloc-use-bug_on-instead-of-if-condition-followed-by-bug.patch removed from -mm tree
@ 2021-05-08 22:51 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2021-05-08 22:51 UTC (permalink / raw)
To: minchan, mm-commits, sergey.senozhatsky.work, zhouchuangao
The patch titled
Subject: mm/zsmalloc: use BUG_ON instead of if condition followed by BUG.
has been removed from the -mm tree. Its filename was
mm-zsmalloc-use-bug_on-instead-of-if-condition-followed-by-bug.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: zhouchuangao <zhouchuangao@vivo.com>
Subject: mm/zsmalloc: use BUG_ON instead of if condition followed by BUG.
It can be optimized at compile time.
Link: https://lkml.kernel.org/r/1616727798-9110-1-git-send-email-zhouchuangao@vivo.com
Signed-off-by: zhouchuangao <zhouchuangao@vivo.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/zsmalloc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/mm/zsmalloc.c~mm-zsmalloc-use-bug_on-instead-of-if-condition-followed-by-bug
+++ a/mm/zsmalloc.c
@@ -1987,8 +1987,7 @@ static int zs_page_migrate(struct addres
head = obj_to_head(page, addr);
if (head & OBJ_ALLOCATED_TAG) {
handle = head & ~OBJ_ALLOCATED_TAG;
- if (!testpin_tag(handle))
- BUG();
+ BUG_ON(!testpin_tag(handle));
old_obj = handle_to_obj(handle);
obj_to_location(old_obj, &dummy, &obj_idx);
@@ -2035,8 +2034,7 @@ unpin_objects:
head = obj_to_head(page, addr);
if (head & OBJ_ALLOCATED_TAG) {
handle = head & ~OBJ_ALLOCATED_TAG;
- if (!testpin_tag(handle))
- BUG();
+ BUG_ON(!testpin_tag(handle));
unpin_tag(handle);
}
}
_
Patches currently in -mm which might be from zhouchuangao@vivo.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-08 22:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-08 22:51 [merged] mm-zsmalloc-use-bug_on-instead-of-if-condition-followed-by-bug.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).