The patch titled
Subject: kexec: fix wrong types of some local variables
has been removed from the -mm tree. Its filename was
kexec-fix-wrong-types-of-some-local-variables.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Simon Horman <horms@xxxxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/kexec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/kexec.c~kexec-fix-wrong-types-of-some-local-variables kernel/kexec.c
--- a/kernel/kexec.c~kexec-fix-wrong-types-of-some-local-variables
+++ a/kernel/kexec.c
@@ -786,7 +786,7 @@ static int kimage_load_normal_segment(st
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(str
* 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 *f
{
va_list args;
char buf[0x50];
- int r;
+ size_t r;
va_start(args, fmt);
r = vsnprintf(buf, sizeof(buf), fmt, args);
_
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
