The patch titled Subject: kexec: Use min() and min_t() to simplify logic has been removed from the -mm tree. Its filename was kexec-use-min_t-to-simplify-logic.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Subject: kexec: Use min() and min_t() to simplify logic Simplify the logic of variable assignments. [akpm@xxxxxxxxxxxxxxxxxxxx: replace min_t with min, remove unneeded casts] Signed-off-by: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Reviewed-by: Simon Horman <horms@xxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/kexec.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff -puN kernel/kexec.c~kexec-use-min_t-to-simplify-logic kernel/kexec.c --- a/kernel/kexec.c~kexec-use-min_t-to-simplify-logic +++ a/kernel/kexec.c @@ -819,13 +819,9 @@ static int kimage_load_normal_segment(st /* Start with a clear page */ clear_page(ptr); ptr += maddr & ~PAGE_MASK; - mchunk = PAGE_SIZE - (maddr & ~PAGE_MASK); - if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; - if (uchunk > ubytes) - uchunk = ubytes; + mchunk = min_t(size_t, mbytes, + PAGE_SIZE - (maddr & ~PAGE_MASK)); + uchunk = min(ubytes, mchunk); result = copy_from_user(ptr, buf, uchunk); kunmap(page); @@ -871,13 +867,10 @@ static int kimage_load_crash_segment(str } ptr = kmap(page); ptr += maddr & ~PAGE_MASK; - mchunk = PAGE_SIZE - (maddr & ~PAGE_MASK); - if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; - if (uchunk > ubytes) { - uchunk = ubytes; + mchunk = min_t(size_t, mbytes, + PAGE_SIZE - (maddr & ~PAGE_MASK)); + uchunk = min(ubytes, mchunk); + if (mchunk > uchunk) { /* Zero the trailing part of the page */ memset(ptr + uchunk, 0, mchunk - uchunk); } @@ -1546,8 +1539,7 @@ void vmcoreinfo_append_str(const char *f r = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - if (r + vmcoreinfo_size > vmcoreinfo_max_size) - r = vmcoreinfo_max_size - vmcoreinfo_size; + r = min(r, vmcoreinfo_max_size - vmcoreinfo_size); memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r); _ Patches currently in -mm which might be from zhangyanfei@xxxxxxxxxxxxxx are origin.patch ipvs-change-type-of-netns_ipvs-sysctl_sync_qlen_max.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