From 3a869fe22a2ca22a69f11b1caed20fde2a21108f Mon Sep 17 00:00:00 2001 From: Fang Wenqi Date: Tue, 9 Mar 2010 18:54:28 +0800 Subject: [PATCH] --- yaml --- r: 188811 b: refs/heads/master c: d4bee0a677cfa5a32f964ffa420e27406c65e605 h: refs/heads/master i: 188809: 770006eac8845140f5fb0ead3001b194b644c785 188807: 9c24f2b97e121b1f0f01b0650c9f90b810eb23ee v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_buffer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f54d92b0c77..4d41308b7e87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e74d098c66543d0731de62eb747ccd5b636a6f4c +refs/heads/master: d4bee0a677cfa5a32f964ffa420e27406c65e605 diff --git a/trunk/drivers/char/tty_buffer.c b/trunk/drivers/char/tty_buffer.c index af8d97715728..7ee52164d474 100644 --- a/trunk/drivers/char/tty_buffer.c +++ b/trunk/drivers/char/tty_buffer.c @@ -248,7 +248,7 @@ int tty_insert_flip_string_fixed_flag(struct tty_struct *tty, { int copied = 0; do { - int goal = min(size - copied, TTY_BUFFER_PAGE); + int goal = min_t(size_t, size - copied, TTY_BUFFER_PAGE); int space = tty_buffer_request_room(tty, goal); struct tty_buffer *tb = tty->buf.tail; /* If there is no space then tb may be NULL */ @@ -285,7 +285,7 @@ int tty_insert_flip_string_flags(struct tty_struct *tty, { int copied = 0; do { - int goal = min(size - copied, TTY_BUFFER_PAGE); + int goal = min_t(size_t, size - copied, TTY_BUFFER_PAGE); int space = tty_buffer_request_room(tty, goal); struct tty_buffer *tb = tty->buf.tail; /* If there is no space then tb may be NULL */