Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp849900pja; Wed, 1 Apr 2020 09:49:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtMo2xuDA/zBxW1MSstXuO/qmMp0Jc/XvV51F5V5kas/RdTk/izonY94cIVdf9R3h9bJSja X-Received: by 2002:a4a:8604:: with SMTP id v4mr17518825ooh.82.1585759750038; Wed, 01 Apr 2020 09:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759750; cv=none; d=google.com; s=arc-20160816; b=z3Y9wUr1oOni+0eaNyxPiyT4POmQ8PbjI/2Toa00WhZV+bXv4btI9mqFpxlSg9oe8+ +XUSU2BLRdA01yA5QMiU8cKomL33wdN+rZBHSVCfZvcmiWPj9YU6fKykhh/etdRWnilP nFygn8b+m/k7Cr7g5dpR+b55N2hlPVmRWUa0cfFcJ9c8+OR4rXE1s56u0c6bDxGp6dnR uYRMsqQSr2NQNTnpiGqDbI34EAXycsRsFBrapRtj2i+KC5B/oVhcqBy5qA9li2ihrRsP idMw8IGCa5mJRYXJ5imLX938Ls2HmJNJhzhChcPRPOl/cLSUK3vGjXETGGTFA9QtiJ1S CXUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U2lEmHRJ5RItPbG90bHN8ukxwp2grvM7MUBEbAzlr4U=; b=pExgKG2r8yzjGV5czLcHxfOMYaEgZs8xQdqJFFBqYRUMjTFU6JRCUT1sDOP5gRL/cw WIXHz+jGA/apVjYBrjSnjlOOR3e2FuSAQ/jpF7QTFHBv9c+HJOnguud3jVVqWW8F6DiQ PZkOCWgT6rpI0sDOzqNXNjra2V3rAOS9b5t+qESigc9VBmg5yOEwr3L4S1iRzKmvDUiA 7iuB7Xohfo5bQ6x2HU/If/QrzOZccGcUmH4QCFPh4FifIV5BZw/q32OCwGYcnsbMFVkr B3/FjyIIRw75u184PBAAEYJMxsTCc5C+Wc7XYAJPWiN0lA4o70cagWMxSJnYNusnBYkE /oPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RZ3+wyMp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 63si971113otm.66.2020.04.01.09.48.55; Wed, 01 Apr 2020 09:49:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RZ3+wyMp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389981AbgDAQqr (ORCPT + 99 others); Wed, 1 Apr 2020 12:46:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:48120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388548AbgDAQql (ORCPT ); Wed, 1 Apr 2020 12:46:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7408B20784; Wed, 1 Apr 2020 16:46:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759600; bh=ZzzhJnq45pTNG7JkmwY4o7RFjA//TSQkMxWONW6WaZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RZ3+wyMpRxNRKqPSogIN4XIdct+kgKlcY09jYYbKTgK4wwA40IqOhcEsx8YR98EgR 2/iXOW3I9OYhLm1/epmXXi5gg+uoCXXLV2wutJcmeG4tK0vpmI42JaGCJirfqzUvZN Og9PtENjCEd66mVDahk4b0vmj9QGYb0gVZ6VCiJ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Slaby Subject: [PATCH 4.14 132/148] vt: selection, introduce vc_is_sel Date: Wed, 1 Apr 2020 18:18:44 +0200 Message-Id: <20200401161605.028788273@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Slaby commit dce05aa6eec977f1472abed95ccd71276b9a3864 upstream. Avoid global variables (namely sel_cons) by introducing vc_is_sel. It checks whether the parameter is the current selection console. This will help putting sel_cons to a struct later. Signed-off-by: Jiri Slaby Link: https://lore.kernel.org/r/20200219073951.16151-1-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- drivers/tty/vt/selection.c | 5 +++++ drivers/tty/vt/vt.c | 7 ++++--- drivers/tty/vt/vt_ioctl.c | 2 +- include/linux/selection.h | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c @@ -83,6 +83,11 @@ void clear_selection(void) } } +bool vc_is_sel(struct vc_data *vc) +{ + return vc == sel_cons; +} + /* * User settable table: what characters are to be considered alphabetic? * 128 bits. Locked by the console lock. --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -584,8 +584,9 @@ static void hide_softcursor(struct vc_da static void hide_cursor(struct vc_data *vc) { - if (vc == sel_cons) + if (vc_is_sel(vc)) clear_selection(); + vc->vc_sw->con_cursor(vc, CM_ERASE); hide_softcursor(vc); } @@ -595,7 +596,7 @@ static void set_cursor(struct vc_data *v if (!con_is_fg(vc) || console_blanked || vc->vc_mode == KD_GRAPHICS) return; if (vc->vc_deccm) { - if (vc == sel_cons) + if (vc_is_sel(vc)) clear_selection(); add_softcursor(vc); if ((vc->vc_cursor_type & 0x0f) != 1) @@ -873,7 +874,7 @@ static int vc_do_resize(struct tty_struc if (!newscreen) return -ENOMEM; - if (vc == sel_cons) + if (vc_is_sel(vc)) clear_selection(); old_rows = vc->vc_rows; --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -43,7 +43,7 @@ char vt_dont_switch; extern struct tty_driver *console_driver; #define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count) -#define VT_BUSY(i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons) +#define VT_BUSY(i) (VT_IS_IN_USE(i) || i == fg_console || vc_is_sel(vc_cons[i].d)) /* * Console (vt and kd) routines, as defined by USL SVR4 manual, and by --- a/include/linux/selection.h +++ b/include/linux/selection.h @@ -13,8 +13,8 @@ struct tty_struct; -extern struct vc_data *sel_cons; struct tty_struct; +struct vc_data; extern void clear_selection(void); extern int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty); @@ -23,6 +23,8 @@ extern int sel_loadlut(char __user *p); extern int mouse_reporting(void); extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry); +bool vc_is_sel(struct vc_data *vc); + extern int console_blanked; extern const unsigned char color_table[];