]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vt: switch vt_dont_switch to bool
authorJiri Slaby <jslaby@suse.cz>
Wed, 19 Feb 2020 07:39:48 +0000 (08:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Apr 2020 13:09:51 +0000 (15:09 +0200)
commit f400991bf872debffb01c46da882dc97d7e3248e upstream.

vt_dont_switch is pure boolean, no need for whole char.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219073951.16151-6-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/vt_ioctl.c
include/linux/vt_kern.h

index 693d9d7ffb68fba265b5854820329ecf1dc36550..38948ac5fc49bcc482df137aebe2c35601b9be43 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/kbd_diacr.h>
 #include <linux/selection.h>
 
-char vt_dont_switch;
+bool vt_dont_switch;
 
 static inline bool vt_in_use(unsigned int i)
 {
@@ -1026,12 +1026,12 @@ int vt_ioctl(struct tty_struct *tty,
        case VT_LOCKSWITCH:
                if (!capable(CAP_SYS_TTY_CONFIG))
                        return -EPERM;
-               vt_dont_switch = 1;
+               vt_dont_switch = true;
                break;
        case VT_UNLOCKSWITCH:
                if (!capable(CAP_SYS_TTY_CONFIG))
                        return -EPERM;
-               vt_dont_switch = 0;
+               vt_dont_switch = false;
                break;
        case VT_GETHIFONTMASK:
                ret = put_user(vc->vc_hi_font_mask,
index 8dc77e40bc03875a3adfde0d85a8441a627ab4f0..ded5c48598f3679caf945e444275171343ef032b 100644 (file)
@@ -135,7 +135,7 @@ extern int do_unbind_con_driver(const struct consw *csw, int first, int last,
                             int deflt);
 int vty_init(const struct file_operations *console_fops);
 
-extern char vt_dont_switch;
+extern bool vt_dont_switch;
 extern int default_utf8;
 extern int global_cursor_default;