diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/sgi | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/sgi')
| -rw-r--r-- | drivers/sgi/char/ds1286.c | 6 | ||||
| -rw-r--r-- | drivers/sgi/char/sgicons.c | 4 | ||||
| -rw-r--r-- | drivers/sgi/char/sgiserial.c | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/drivers/sgi/char/ds1286.c b/drivers/sgi/char/ds1286.c index 0d3f7a005..3de270157 100644 --- a/drivers/sgi/char/ds1286.c +++ b/drivers/sgi/char/ds1286.c @@ -1,4 +1,4 @@ -/* $Id: ds1286.c,v 1.1 1998/07/09 20:01:29 ralf Exp $ +/* $Id: ds1286.c,v 1.2 1998/08/25 09:18:57 ralf Exp $ * * Real Time Clock interface for Linux * @@ -432,7 +432,7 @@ int get_ds1286_status(char *buf) * greater than a valid time, but less than 0xc0 shouldn't appear. */ get_rtc_alm_time(&tm); - p += sprintf(p, "alarm\t\t: %s ", days[tm.tm_wday]); + p += sprintf(p, "alarm\t\t\t: %s ", days[tm.tm_wday]); if (tm.tm_hour <= 24) p += sprintf(p, "%02d:", tm.tm_hour); else @@ -462,7 +462,7 @@ int get_ds1286_status(char *buf) cmd = CMOS_READ(RTC_CMD); p += sprintf(p, - "alarm\t\t: %s\n" + "alarm\t\t\t: %s\n" "wdog_alarm\t: %s\n" "alarm_mask\t: %s\n" "wdog_alarm_mask\t: %s\n" diff --git a/drivers/sgi/char/sgicons.c b/drivers/sgi/char/sgicons.c index 1b3c95a5e..2ade5a311 100644 --- a/drivers/sgi/char/sgicons.c +++ b/drivers/sgi/char/sgicons.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: sgicons.c,v 1.10 1998/08/25 09:18:58 ralf Exp $ * * sgicons.c: Setting up and registering console I/O on the SGI. * @@ -14,7 +14,7 @@ #include "gconsole.h" /* To make psaux code cleaner */ -int aux_device_present = 0xaa; +unsigned char aux_device_present = 0xaa; /* This is the system graphics console (the first adapter found) */ struct console_ops *gconsole = 0; diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c index 2d2f8ebed..ccd0114f1 100644 --- a/drivers/sgi/char/sgiserial.c +++ b/drivers/sgi/char/sgiserial.c @@ -1263,10 +1263,9 @@ static void send_break( struct sgi_serial * info, int duration) if (!info->port) return; current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies + duration; cli(); write_zsreg(info->zs_channel, 5, (info->curregs[5] | SND_BRK)); - schedule(); + schedule_timeout(duration); write_zsreg(info->zs_channel, 5, info->curregs[5]); sti(); } @@ -1467,8 +1466,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) if (info->blocked_open) { if (info->close_delay) { current->state = TASK_INTERRUPTIBLE; - current->timeout = jiffies + info->close_delay; - schedule(); + schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); } |