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

• Lines: 18
• Date: Mon Nov 2 13:21:42 1998
• Orig file: v2.1.126/linux/drivers/char/console.c
• Orig date: Fri Oct 9 13:27:07 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -2415,7 +2415,7 @@
 	}
 	printk("Console: switching ");
 	if (!deflt)
-		printk("consoles %d-%d ", first, last);
+		printk("consoles %d-%d ", first+1, last+1);
 	if (j >= 0)
 		printk("to %s %s %dx%d\n",
 		       vc_cons[j].d->vc_can_do_color ? "colour" : "mono",
@@ -2564,7 +2564,7 @@
 		return;
 	if (console_blanked) {
 		timer_table[BLANK_TIMER].fn = unblank_screen;
-		timer_table[BLANK_TIMER].expires = 0;
+		timer_table[BLANK_TIMER].expires = jiffies;	/* Now */
 		timer_active |= 1<<BLANK_TIMER;
 	} else if (blankinterval) {
 		timer_table[BLANK_TIMER].expires = jiffies + blankinterval;