patch-2.3.16 linux/arch/ppc/8xx_io/uart.c

• Lines: 36
• Date: Tue Aug 31 11:30:47 1999
• Orig file: v2.3.15/linux/arch/ppc/8xx_io/uart.c
• Orig date: Sat May 15 15:05:35 1999

diff -u --recursive --new-file v2.3.15/linux/arch/ppc/8xx_io/uart.c linux/arch/ppc/8xx_io/uart.c
@@ -1826,7 +1826,7 @@
 				   serial_inp(info, UART_MCR) |
 				   (UART_MCR_DTR | UART_MCR_RTS));
 		sti();
-		current->state = TASK_INTERRUPTIBLE;
+		set_current_state(TASK_INTERRUPTIBLE);
 		if (tty_hung_up_p(filp) ||
 		    !(info->flags & ASYNC_INITIALIZED)) {
 #ifdef SERIAL_DO_RESTART
@@ -2243,7 +2243,7 @@
 /*
  *	Register console.
  */
-__initfunc (long console_8xx_init(long kmem_start, long kmem_end))
+long __init console_8xx_init(long kmem_start, long kmem_end)
 {
 	register_console(&sercons);
 	return kmem_start;
@@ -2254,7 +2254,7 @@
 /*
  * The serial driver boot-time initialization code!
  */
-__initfunc(int rs_8xx_init(void))
+int __init rs_8xx_init(void)
 {
 	struct serial_state * state;
 	ser_info_t	*info;
@@ -2596,7 +2596,7 @@
 /* This must always be called before the rs_8xx_init() function, otherwise
  * it blows away the port control information.
 */
-__initfunc(static int serial_console_setup(struct console *co, char *options))
+static int __init serial_console_setup(struct console *co, char *options)
 {
 	struct		serial_state *ser;
 	uint		mem_addr, dp_addr;