git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
macintosh
/
macserial.c
diff --git
a/drivers/macintosh/macserial.c
b/drivers/macintosh/macserial.c
index
1d61a9a
..
2ac2b91
100644
(file)
--- a/
drivers/macintosh/macserial.c
+++ b/
drivers/macintosh/macserial.c
@@
-158,6
+158,10
@@
static void dma_init(struct mac_serial * info);
static void rxdma_start(struct mac_serial * info, int current);
static void rxdma_to_tty(struct mac_serial * info);
static void rxdma_start(struct mac_serial * info, int current);
static void rxdma_to_tty(struct mac_serial * info);
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
/*
* tmp_buf is used as a temporary buffer by serial_write. We need to
* lock it in case the copy_from_user blocks while swapping in a page,
/*
* tmp_buf is used as a temporary buffer by serial_write. We need to
* lock it in case the copy_from_user blocks while swapping in a page,
@@
-1481,8
+1485,9
@@
static int rs_write(struct tty_struct * tty, int from_user,
if (from_user) {
down(&tmp_buf_sem);
while (1) {
if (from_user) {
down(&tmp_buf_sem);
while (1) {
- c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ c = MIN(count,
+ MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0)
break;
if (c <= 0)
break;
@@
-1493,8
+1498,8
@@
static int rs_write(struct tty_struct * tty, int from_user,
break;
}
spin_lock_irqsave(&info->lock, flags);
break;
}
spin_lock_irqsave(&info->lock, flags);
- c =
min_t(int, c, min
(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
-
SERIAL_XMIT_SIZE - info->xmit_head));
+ c =
MIN(c, MIN
(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
info->xmit_head = ((info->xmit_head + c) &
(SERIAL_XMIT_SIZE-1));
memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
info->xmit_head = ((info->xmit_head + c) &
(SERIAL_XMIT_SIZE-1));
@@
-1508,8
+1513,9
@@
static int rs_write(struct tty_struct * tty, int from_user,
} else {
while (1) {
spin_lock_irqsave(&info->lock, flags);
} else {
while (1) {
spin_lock_irqsave(&info->lock, flags);
- c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ c = MIN(count,
+ MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0) {
spin_unlock_irqrestore(&info->lock, flags);
break;
if (c <= 0) {
spin_unlock_irqrestore(&info->lock, flags);
break;
@@
-2046,7
+2052,7
@@
static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
} else if (char_time == 0)
char_time = 1;
if (timeout)
} else if (char_time == 0)
char_time = 1;
if (timeout)
- char_time =
min_t(unsigned long,
char_time, timeout);
+ char_time =
MIN(
char_time, timeout);
while ((read_zsreg(info->zs_channel, 1) & ALL_SNT) == 0) {
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(char_time);
while ((read_zsreg(info->zs_channel, 1) & ALL_SNT) == 0) {
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(char_time);