Commit bdfb9da1 authored by Jiri Slaby's avatar Jiri Slaby Committed by Yang Yingliang
Browse files

vt: switch vt_dont_switch to bool 



commit f400991b upstream.

vt_dont_switch is pure boolean, no need for whole char.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219073951.16151-6-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 4ac10e26

drivers/tty/vt/vt_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{
@@ -1021,12 +1021,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,

include/linux/vt_kern.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline bool vt_force_oops_output(struct vc_data *vc) 
	return false;

}



extern char vt_dont_switch;

extern bool vt_dont_switch;

extern int default_utf8;

extern int global_cursor_default;