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

• Lines: 18
• Date: Sat May 15 15:05:36 1999
• Orig file: v2.3.2/linux/drivers/sgi/char/sgiserial.c
• Orig date: Thu Nov 5 09:58:44 1998

diff -u --recursive --new-file v2.3.2/linux/drivers/sgi/char/sgiserial.c linux/drivers/sgi/char/sgiserial.c
@@ -33,7 +33,7 @@
 #define NUM_SERIAL 1     /* One chip on board. */
 #define NUM_CHANNELS (NUM_SERIAL * 2)
 
-extern struct wait_queue * keypress_wait;
+extern struct wait_queue_head_t keypress_wait;
 
 struct sgi_zslayout *zs_chips[NUM_SERIAL] = { 0, };
 struct sgi_zschannel *zs_channels[NUM_CHANNELS] = { 0, 0, };
@@ -1519,7 +1519,7 @@
 static int block_til_ready(struct tty_struct *tty, struct file * filp,
 			   struct sgi_serial *info)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	int		retval;
 	int		do_clocal = 0;