aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2010-12-15 13:56:09 +0000
committerJohn Rigby <john.rigby@linaro.org>2011-08-21 21:30:15 -0600
commit46772a420374eb09188d6f935c62b1edfe771322 (patch)
treeb903948c2ac701f6fa533057bee12ee93df13bf6 /drivers
parenta1e2ecee401ac473314d52ed7225a0146e059d62 (diff)
UBUNTU: SAUCE: vt -- fix handoff numbering to 1..n and add range checks (grub)
BugLink: http://bugs.launchpad.net/bugs/689606 Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/vt/vt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 3834eda26ee..15764df2a00 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2895,9 +2895,10 @@ static int __init con_init(void)
unsigned int currcons = 0, i;
if (screen_info.flags & VIDEO_FLAGS_HANDOFF) {
- printk(KERN_INFO "vt handoff: grub requested handoff (vt#8)\n");
- if (vt_handoff == -1)
+ if (vt_handoff == 0)
vt_handoff = 8;
+ printk(KERN_INFO "vt handoff: grub requested handoff (vt#%d)\n",
+ vt_handoff);
}
console_lock();