[5.5,07/30] vt: switch vt_dont_switch to bool

Message ID	20200401161420.268112172@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=zuZT=5R=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jiri Slaby <jslaby@suse.cz> Subject: [PATCH 5.5 07/30] vt: switch vt_dont_switch to bool Date: Wed, 1 Apr 2020 18:17:11 +0200 Message-Id: <20200401161420.268112172@linuxfoundation.org> In-Reply-To: <20200401161414.345528747@linuxfoundation.org> References: <20200401161414.345528747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,02/30] mac80211: Check port authorization in the ieee80211_tx_dequeue() case [5.5,04/30] serial: sprd: Fix a dereference warning [5.5,06/30] vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines [5.5,07/30] vt: switch vt_dont_switch to bool [5.5,09/30] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console [5.5,11/30] platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table [5.5,13/30] bpf: Explicitly memset some bpf info structures declared on the stack [5.5,14/30] iwlwifi: dont send GEO_TX_POWER_LIMIT if no wgds table [5.5,15/30] gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model [5.5,18/30] clk: imx: Align imx sc clock parent msg structs to 4 [5.5,23/30] ARM: dts: oxnas: Fix clear-mask property [5.5,24/30] ARM: dts: bcm283x: Fix vc4s firmware bus DMA limitations [5.5,25/30] ARM: bcm2835-rpi-zero-w: Add missing pinctrl name [5.5,27/30] ARM: dts: N900: fix onenand timings [5.5,28/30] ARM: dts: sun8i: r40: Move AHCI device node based on address order

Message ID

20200401161420.268112172@linuxfoundation.org

State

Superseded

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH 5.5 07/30] vt: switch vt_dont_switch to bool
Date: Wed,  1 Apr 2020 18:17:11 +0200
Message-Id: <20200401161420.268112172@linuxfoundation.org>
In-Reply-To: <20200401161414.345528747@linuxfoundation.org>
References: <20200401161414.345528747@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg KH April 1, 2020, 4:17 p.m. UTC

From: Jiri Slaby <jslaby@suse.cz>

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 |    6 +++---
 include/linux/vt_kern.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -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,
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -135,7 +135,7 @@  extern int do_unbind_con_driver(const st
 			     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;

[5.5,07/30] vt: switch vt_dont_switch to bool

Commit Message

Patch