diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/sgi/char/sgiserial.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/sgi/char/sgiserial.c')
| -rw-r--r-- | drivers/sgi/char/sgiserial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c index 2aa21d2be..08cc902df 100644 --- a/drivers/sgi/char/sgiserial.c +++ b/drivers/sgi/char/sgiserial.c @@ -1651,7 +1651,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, if (!(info->flags & ZILOG_CALLOUT_ACTIVE)) zs_rtsdtr(info, 1); sti(); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); if (tty_hung_up_p(filp) || !(info->flags & ZILOG_INITIALIZED)) { #ifdef SERIAL_DO_RESTART @@ -2106,7 +2106,7 @@ static kdev_t zs_console_device(struct console *con) } -__initfunc(static int zs_console_setup(struct console *con, char *options)) +static int __init zs_console_setup(struct console *con, char *options) { struct sgi_serial *info; int baud = 9600; @@ -2246,7 +2246,7 @@ static struct console sgi_console_driver = { /* * Register console. */ -__initfunc (long serial_console_init(long kmem_start, long kmem_end)) +long __init serial_console_init(long kmem_start, long kmem_end) { register_console(&sgi_console_driver); return kmem_start; |