Commit e11c0cdf authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] uml: fix min usage

type-safe min() in arch/um/drivers/mconsole_kern.c
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 43cecb30
...@@ -616,7 +616,7 @@ static void console_write(struct console *console, const char *string, ...@@ -616,7 +616,7 @@ static void console_write(struct console *console, const char *string,
return; return;
while(1){ while(1){
n = min(len, ARRAY_SIZE(console_buf) - console_index); n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index);
strncpy(&console_buf[console_index], string, n); strncpy(&console_buf[console_index], string, n);
console_index += n; console_index += n;
string += n; string += n;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment