git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
vt_ioctl.c
diff --git
a/drivers/char/vt_ioctl.c
b/drivers/char/vt_ioctl.c
index
a5628a8
..
a53e382
100644
(file)
--- a/
drivers/char/vt_ioctl.c
+++ b/
drivers/char/vt_ioctl.c
@@
-96,7
+96,7
@@
do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
if (!perm)
return -EPERM;
if (!i && v == K_NOSUCHMAP) {
if (!perm)
return -EPERM;
if (!i && v == K_NOSUCHMAP) {
- /* d
is
allocate map */
+ /* d
e
allocate map */
key_map = key_maps[s];
if (s && key_map) {
key_maps[s] = NULL;
key_map = key_maps[s];
if (s && key_map) {
key_maps[s] = NULL;
@@
-819,20
+819,20
@@
int vt_ioctl(struct tty_struct *tty, struct file * file,
if (arg > MAX_NR_CONSOLES)
return -ENXIO;
if (arg == 0) {
if (arg > MAX_NR_CONSOLES)
return -ENXIO;
if (arg == 0) {
- /* d
is
allocate all unused consoles, but leave 0 */
+ /* d
e
allocate all unused consoles, but leave 0 */
acquire_console_sem();
for (i=1; i<MAX_NR_CONSOLES; i++)
if (! VT_BUSY(i))
acquire_console_sem();
for (i=1; i<MAX_NR_CONSOLES; i++)
if (! VT_BUSY(i))
- vc_d
is
allocate(i);
+ vc_d
e
allocate(i);
release_console_sem();
} else {
release_console_sem();
} else {
- /* d
is
allocate a single console, if possible */
+ /* d
e
allocate a single console, if possible */
arg--;
if (VT_BUSY(arg))
return -EBUSY;
if (arg) { /* leave 0 */
acquire_console_sem();
arg--;
if (VT_BUSY(arg))
return -EBUSY;
if (arg) { /* leave 0 */
acquire_console_sem();
- vc_d
is
allocate(arg);
+ vc_d
e
allocate(arg);
release_console_sem();
}
}
release_console_sem();
}
}
@@
-847,11
+847,8
@@
int vt_ioctl(struct tty_struct *tty, struct file * file,
if (get_user(ll, &vtsizes->v_rows) ||
get_user(cc, &vtsizes->v_cols))
return -EFAULT;
if (get_user(ll, &vtsizes->v_rows) ||
get_user(cc, &vtsizes->v_cols))
return -EFAULT;
- for (i = 0; i < MAX_NR_CONSOLES; i++) {
- acquire_console_sem();
- vc_resize(vc_cons[i].d, cc, ll);
- release_console_sem();
- }
+ for (i = 0; i < MAX_NR_CONSOLES; i++)
+ vc_lock_resize(vc_cons[i].d, cc, ll);
return 0;
}
return 0;
}