patch-2.2.13 linux/drivers/char/console.c

• Lines: 20
• Date: Tue Oct 19 17:14:00 1999
• Orig file: v2.2.12/linux/drivers/char/console.c
• Orig date: Wed Mar 10 16:51:35 1999

diff -u --recursive --new-file v2.2.12/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -1984,7 +1984,7 @@
 	static unsigned long printing = 0;
 	const ushort *start;
 	ushort cnt = 0;
-	ushort myx = x;
+	ushort myx;
 
 	/* console busy or not yet initialized */
 	if (!printable || test_and_set_bit(0, &printing))
@@ -1992,6 +1992,10 @@
 
 	if (kmsg_redirect && vc_cons_allocated(kmsg_redirect - 1))
 		currcons = kmsg_redirect - 1;
+
+	/* read `x' only after setting currecons properly (otherwise
+	   the `x' macro will read the x of the foreground console). */
+	myx = x;
 
 	if (!vc_cons_allocated(currcons)) {
 		/* impossible */