summaryrefslogtreecommitdiffstats
path: root/drivers/char/vt_ioctl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-21 13:28:24 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-21 13:28:24 +0200
commit470fba7ebe60ad9185056b080b331abad24b4df9 (patch)
treef83bc13d97adaf5dd0e0f1d6a157b890f868577f /drivers/char/vt_ioctl.c
parentdocumentation: move mtrr.txt to Doc/x86/ subdir (diff)
parentLinux v2.6.27-rc4 (diff)
downloadlinux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz
linux-470fba7ebe60ad9185056b080b331abad24b4df9.zip
Merge branch 'linus' into x86/doc
Diffstat (limited to 'drivers/char/vt_ioctl.c')
-rw-r--r--drivers/char/vt_ioctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 3211afd9d57e..c904e9ad4a71 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -947,14 +947,16 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
get_user(cc, &vtsizes->v_cols))
ret = -EFAULT;
else {
+ acquire_console_sem();
for (i = 0; i < MAX_NR_CONSOLES; i++) {
vc = vc_cons[i].d;
if (vc) {
vc->vc_resize_user = 1;
- vc_lock_resize(vc_cons[i].d, cc, ll);
+ vc_resize(vc_cons[i].d, cc, ll);
}
}
+ release_console_sem();
}
break;
}