Skip to content

Commit

Permalink
kexec: fix wrong types of some local variables
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: Simon Horman <[email protected]>
Cc: Joe Perches <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Zhang Yanfei authored and torvalds committed May 1, 2013
1 parent e56fb28 commit 310faaa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 310faaa

Please sign in to comment.