Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static void console_write(struct console *console, const char *string,
		return;

	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);
		console_index += n;
		string += n;