diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-31 05:30:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:51 -0500 |
commit | e11c0cdf4c6f7976e6f4fe221369a7b420245389 (patch) | |
tree | f2a5a0b4cd0e2946173fb85808cd8e1e7eb455ed /arch | |
parent | 43cecb3079d048800e828edafb937e596152908d (diff) |
[PATCH] uml: fix min usage
type-safe min() in arch/um/drivers/mconsole_kern.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index d060fce4940e..28e3760e8b98 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
@@ -616,7 +616,7 @@ static void console_write(struct console *console, const char *string, | |||
616 | return; | 616 | return; |
617 | 617 | ||
618 | while(1){ | 618 | while(1){ |
619 | n = min(len, ARRAY_SIZE(console_buf) - console_index); | 619 | n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index); |
620 | strncpy(&console_buf[console_index], string, n); | 620 | strncpy(&console_buf[console_index], string, n); |
621 | console_index += n; | 621 | console_index += n; |
622 | string += n; | 622 | string += n; |