[PATCH v3 1/2] kexec: fix wrong types of some local variables

Zhang Yanfei zhangyanfei at cn.fujitsu.com
Tue Feb 26 00:15:16 EST 2013


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.

Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Simon Horman <horms at verge.net.au>
Signed-off-by: Zhang Yanfei <zhangyanfei at cn.fujitsu.com>
---
 kernel/kexec.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 2436ffc..3cbfcc7 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -789,7 +789,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;
 
@@ -853,7 +853,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;
 
@@ -1455,7 +1455,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);
-- 
1.7.1



More information about the kexec mailing list