[folded-merged] mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix
has been removed from the -mm tree.  Its filename was
     mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix.patch

This patch was dropped because it was folded into mm-zsmalloc-simplify-zs_max_alloc_size-handling.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix

use min_t

Cc: Jerome Marchand <jmarchan@xxxxxxxxxx>
Cc: Mahendran Ganesh <opensource.ganesh@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/zsmalloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/zsmalloc.c~mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix mm/zsmalloc.c
--- a/mm/zsmalloc.c~mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix
+++ a/mm/zsmalloc.c
@@ -548,7 +548,7 @@ static int get_size_class_index(int size
 		idx = DIV_ROUND_UP(size - ZS_MIN_ALLOC_SIZE,
 				ZS_SIZE_CLASS_DELTA);
 
-	return min((int)ZS_SIZE_CLASSES - 1, idx);
+	return min_t(int, ZS_SIZE_CLASSES - 1, idx);
 }
 
 static inline void zs_stat_inc(struct size_class *class,
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

mm-zsmalloc-simplify-zs_max_alloc_size-handling.patch
signal-avoid-undefined-behaviour-in-kill_something_info-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux