kexec: fix wrong types of some local variables

The types of the following local variables:

- ubytes/mbytes in kimage_load_crash_segment()/kimage_load_normal_segment()

- r in vmcoreinfo_append_str()

are wrong, so fix them.

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/kexec.c b/kernel/kexec.c
index b574920cbd4b..b2c1306c863d 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -786,7 +786,7 @@ static int kimage_load_normal_segment(struct kimage *image,
                                          struct kexec_segment *segment)
 {
         unsigned long maddr;
-        unsigned long ubytes, mbytes;
+        size_t ubytes, mbytes;
         int result;
         unsigned char __user *buf;
 
@@ -850,7 +850,7 @@ static int kimage_load_crash_segment(struct kimage *image,
          * We do things a page at a time for the sake of kmap.
          */
         unsigned long maddr;
-        unsigned long ubytes, mbytes;
+        size_t ubytes, mbytes;
         int result;
         unsigned char __user *buf;
 
@@ -1540,7 +1540,7 @@ void vmcoreinfo_append_str(const char *fmt, ...)
 {
         va_list args;
         char buf[0x50];
-        int r;
+        size_t r;
 
         va_start(args, fmt);
         r = vsnprintf(buf, sizeof(buf), fmt, args);