From cedddd450404e439e3a9ea078a026cd1d1c88fc3 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 20 Mar 2013 15:08:33 +1100 Subject: [PATCH] kexec-use-min_t-to-simplify-logic-fix replace min_t with min, remove unneeded casts Cc: "Eric W. Biederman" Cc: Joe Perches Cc: Simon Horman Cc: Zhang Yanfei Signed-off-by: Andrew Morton --- kernel/kexec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 97096351de18..38f5fab4d5eb 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -820,8 +820,8 @@ static int kimage_load_normal_segment(struct kimage *image, clear_page(ptr); ptr += maddr & ~PAGE_MASK; mchunk = min_t(size_t, mbytes, - (size_t)(PAGE_SIZE - (maddr & ~PAGE_MASK))); - uchunk = min_t(size_t, ubytes, mchunk); + PAGE_SIZE - (maddr & ~PAGE_MASK)); + uchunk = min(ubytes, mchunk); result = copy_from_user(ptr, buf, uchunk); kunmap(page); @@ -868,8 +868,8 @@ static int kimage_load_crash_segment(struct kimage *image, ptr = kmap(page); ptr += maddr & ~PAGE_MASK; mchunk = min_t(size_t, mbytes, - (size_t)(PAGE_SIZE - (maddr & ~PAGE_MASK))); - uchunk = min_t(size_t, ubytes, mchunk); + 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); @@ -1447,7 +1447,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - r = min_t(size_t, r, vmcoreinfo_max_size - vmcoreinfo_size); + r = min(r, vmcoreinfo_max_size - vmcoreinfo_size); memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r); -- 2.39.5