|
@@ -503,6 +503,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
|
|
struct kbd_struct * kbd;
|
|
struct kbd_struct * kbd;
|
|
unsigned int console;
|
|
unsigned int console;
|
|
unsigned char ucval;
|
|
unsigned char ucval;
|
|
|
|
+ unsigned int uival;
|
|
void __user *up = (void __user *)arg;
|
|
void __user *up = (void __user *)arg;
|
|
int i, perm;
|
|
int i, perm;
|
|
int ret = 0;
|
|
int ret = 0;
|
|
@@ -657,7 +658,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
|
|
break;
|
|
break;
|
|
|
|
|
|
case KDGETMODE:
|
|
case KDGETMODE:
|
|
- ucval = vc->vc_mode;
|
|
|
|
|
|
+ uival = vc->vc_mode;
|
|
goto setint;
|
|
goto setint;
|
|
|
|
|
|
case KDMAPDISP:
|
|
case KDMAPDISP:
|
|
@@ -695,7 +696,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
|
|
break;
|
|
break;
|
|
|
|
|
|
case KDGKBMODE:
|
|
case KDGKBMODE:
|
|
- ucval = ((kbd->kbdmode == VC_RAW) ? K_RAW :
|
|
|
|
|
|
+ uival = ((kbd->kbdmode == VC_RAW) ? K_RAW :
|
|
(kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW :
|
|
(kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW :
|
|
(kbd->kbdmode == VC_UNICODE) ? K_UNICODE :
|
|
(kbd->kbdmode == VC_UNICODE) ? K_UNICODE :
|
|
K_XLATE);
|
|
K_XLATE);
|
|
@@ -717,9 +718,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
|
|
break;
|
|
break;
|
|
|
|
|
|
case KDGKBMETA:
|
|
case KDGKBMETA:
|
|
- ucval = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
|
|
|
|
|
|
+ uival = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
|
|
setint:
|
|
setint:
|
|
- ret = put_user(ucval, (int __user *)arg);
|
|
|
|
|
|
+ ret = put_user(uival, (int __user *)arg);
|
|
break;
|
|
break;
|
|
|
|
|
|
case KDGETKEYCODE:
|
|
case KDGETKEYCODE:
|
|
@@ -949,7 +950,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
|
|
for (i = 0; i < MAX_NR_CONSOLES; ++i)
|
|
for (i = 0; i < MAX_NR_CONSOLES; ++i)
|
|
if (! VT_IS_IN_USE(i))
|
|
if (! VT_IS_IN_USE(i))
|
|
break;
|
|
break;
|
|
- ucval = i < MAX_NR_CONSOLES ? (i+1) : -1;
|
|
|
|
|
|
+ uival = i < MAX_NR_CONSOLES ? (i+1) : -1;
|
|
goto setint;
|
|
goto setint;
|
|
|
|
|
|
/*
|
|
/*
|