patch-2.3.1 linux/drivers/sbus/char/sunkbd.c

• Lines: 27
• Date: Wed May 12 08:41:15 1999
• Orig file: v2.3.0/linux/drivers/sbus/char/sunkbd.c
• Orig date: Thu Apr 22 19:24:51 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/sbus/char/sunkbd.c linux/drivers/sbus/char/sunkbd.c
@@ -85,7 +85,7 @@
 }
 
 #ifndef CONFIG_PCI
-struct wait_queue * keypress_wait = NULL;
+DECLARE_WAIT_QUEUE_HEAD(keypress_wait);
 #endif
 
 int keyboard_wait_for_keypress(struct console *co)
@@ -1261,7 +1261,7 @@
 static int kbd_head, kbd_tail;
 char kbd_opened;
 static int kbd_active = 0;
-static struct wait_queue *kbd_wait;
+static DECLARE_WAIT_QUEUE_HEAD(kbd_wait);
 static struct fasync_struct *kb_fasync;
 
 void
@@ -1285,7 +1285,7 @@
 static ssize_t
 kbd_read (struct file *f, char *buffer, size_t count, loff_t *ppos)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	char *end, *p;
 
 	/* Return EWOULDBLOCK, because this is what the X server expects */