patch-2.3.16 linux/drivers/sgi/char/sgiserial.c

• Lines: 27
• Date: Tue Aug 31 11:30:48 1999
• Orig file: v2.3.15/linux/drivers/sgi/char/sgiserial.c
• Orig date: Tue Jun 29 09:22:08 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/sgi/char/sgiserial.c linux/drivers/sgi/char/sgiserial.c
@@ -1591,7 +1591,7 @@
 		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
@@ -2045,7 +2045,7 @@
 }
 
 
-__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;
@@ -2185,7 +2185,7 @@
 /*
  *	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;