From patchwork Thu Mar 1 15:27:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130295 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952851edc; Thu, 1 Mar 2018 07:38:53 -0800 (PST) X-Google-Smtp-Source: AG47ELtWmQY8Bdx8kvSpCOHCUhq46+86bS5GQ02GeD75mT8IU/B4QOWPu6PMzdJtSbawl1iRtM4G X-Received: by 2002:a17:902:b187:: with SMTP id s7-v6mr2314044plr.448.1519918732928; Thu, 01 Mar 2018 07:38:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918732; cv=none; d=google.com; s=arc-20160816; b=EMpgnslZHQgkfCm8cwCl0xGWgxMHoMKf2c5YUVhJaPTqkeUSoKFlCpD5kXf0Xz+WYJ HsTjp+89GUUt2gFremJx7UxN2Pv9KH1t5O3uF7p2/Db0G6kVBrylUG1iZprsejRpsVvh CYo3UtYVi09W8HqmjEbFPzfpaSoqCkIqwAP5guCbsMDTZ+b5el5rT++OknqWMMRpjT3P b3I7RRR0YxRDqyakYEXycw0ftkPJbZjy9kmszyXBO+m6fMvYbN98JzobheLXd944xOSn NyvdI7M7XUNYXj0yMwwUiKHD6LdgeIblN8pJbTN6D1d3EODAlwi/p/2AQim7WAmTjJoZ a45Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=9HFLDk7q7O3nRRJMd3RSIzCpzXvNulVjBsWQE1uMhzo=; b=ZGAFvkyS3VVeRVWAtwfvzsXgMnVkk5D3CQHAjwMAEk9K7I6Sxc0ts/xDJ7e6eUXB0v 5EYgbrX/Im+Wo1UWO/iSob4t9O8+kAPM0BaFZYbSnN/ZNS/NNvE1v7ZaeFQcg72ikKrQ jbSLzIremHPXg8nZRpQLJ3F2d1VpKr3yXNTBLPwADxv29lxdIVc34T4hKk5Y2SuIl9PF d+h/gF4MHFAHwVJF2vNo38jOg7cFhxzAjzFfpt07b/lClrMo6ffhip/+mMZ1vIP9AV/5 T4/IrM5BTzbhtnPaQNnsibz77wHV3dcl1LyuIfqxrXYckaz1dwjvcw7SR3TCCOKLCq9y kQLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=X3tc8PuW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si2586092pgs.318.2018.03.01.07.38.52; Thu, 01 Mar 2018 07:38:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=X3tc8PuW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031988AbeCAPiu (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:50 -0500 Received: from mail-sn1nam02on0103.outbound.protection.outlook.com ([104.47.36.103]:11220 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032278AbeCAPib (ORCPT ); Thu, 1 Mar 2018 10:38:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9HFLDk7q7O3nRRJMd3RSIzCpzXvNulVjBsWQE1uMhzo=; b=X3tc8PuWrfTiP1poGPR/36/cKyksb+SP7SFFg969WjrAvwE1x3OZQpqyUADaSemv1ucDBIubSVdlRwFY+PfpuP3SmPJVUBpNcTZOGYiJpVYjjiQzaI9bUDNzExH9MsO6cOpb/b2f71UzzHMUdGBkArI11B7NJCRabah6/o/iK+M= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1016.namprd21.prod.outlook.com (52.132.133.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:26 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:38:26 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Greg Kroah-Hartman , Sasha Levin Subject: [added to the 4.1 stable tree] tty: hvc_xen: hide xen_console_remove when unused Thread-Topic: [added to the 4.1 stable tree] tty: hvc_xen: hide xen_console_remove when unused Thread-Index: AQHTsXHMIt1COLJm7UyQ727D3lIAmQ== Date: Thu, 1 Mar 2018 15:27:23 +0000 Message-ID: <20180301152116.1486-459-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1016; 6:2kutuhNy3jylC7KmAYzKyX5A0gK1BN7EnXESZhcpsxJ67BXiYSbXOlc2AsF3i8AwZWMN9Ai6/bnZic9pzjLq8H+gJOydXy+U/f5ycoGid5eSJfPE5KDHDKQmX58Ymfsti3aNDfWPUiN/xRDhDV9ZR1uqEsnhKhnbYNXywYw00jhYVuHA7E1h7NgykcHa8mUMkG2c8Iz93mWA8pmOfItsaeDH4Gi1KR2BQjYerlYYVOFAJ4pzWKVH0e6pBosqWE90gC2GMHnA90l45CRfwgf1SSrzlu8x5U5mHBtQLA+d3s98NMY40MRIFSm6F8mQZYbmzTvYH2tzfr1ZHeU5XdmQHmll4PwDQ+mFoMf8j9w++b8Q/xsOlzlIZZy5/6hXvpNm; 5:xN5HIZmZyQuyMThMAfTh6ITqs2BicaLGoT0YdIYNtDJ3udVyHZSqJw49expguEODHVqQtK1m/EJqC8XEHV3AYd7CC8Jb9O1RvaoQOil8LfBG72ZjT9BD/xuCgx9+DCvhgvctW9a6RoC0wz0xxdiygS76I6OzS9vS9yhmrD9MD7A=; 24:zXXM5hFvZuz/Xw23k4omwMLB92pGeC6ynaR0XpbF6ZJ59dOXxBoWWr1Ik3H0V4gkXEIpzaW10YgXwWAQakF9sO0ON82dCGiqJwxB9pce6JU=; 7:yHlkIwFyRbtAbDRhPccoMmDHBABdKcnM3ub+fkwBkCHjsgVwB2Au8Wpe8Elfpc+zffJbmtgG4RuWoJHjG3CCbCBhVmKgW/9t4kJuGneb5pv5ql85tUPYL+ptSNJvHzZc7IgjrJ/egda7m3EWHF5IRbRx64INO2k+jz4/ofPRVDAyJSh8JRQ5rV/gkJ8iQcsZW47Ps2q0yPnDUqz3hhOla3U3Vjkv9rnbaCfNq9niKcpzcZ9YMYfWWOhr8eUmoDna x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8799a911-0e95-4147-34fa-08d57f8a79b1 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1016; x-ms-traffictypediagnostic: DM5PR2101MB1016: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501229)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1016; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1016; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(39860400002)(39380400002)(376002)(396003)(189003)(199004)(22452003)(6436002)(8676002)(81156014)(81166006)(53936002)(68736007)(6486002)(6512007)(97736004)(5660300001)(86362001)(575784001)(59450400001)(6506007)(102836004)(6346003)(2906002)(26005)(186003)(4326008)(10290500003)(8936002)(76176011)(478600001)(105586002)(3280700002)(14454004)(54906003)(110136005)(3660700001)(2950100002)(305945005)(7736002)(6116002)(72206003)(1076002)(3846002)(6666003)(316002)(2900100001)(25786009)(36756003)(2501003)(66066001)(107886003)(106356001)(5250100002)(86612001)(99286004)(10090500001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1016; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: Jom33zOgugDCKoHVam7XSidirXUGgi6SRHkVp1r+JYORF98CNbXX8Gh4gE5C0YlBst1SxUIJNw5nJRKdmebK8zMXQd7GnR14g5htuy7qSr1FQ5cc1V/7GedF2IZiDoC6JQVkKZGPgljvQLVGuqBlZo+c9cj5+593pkJQNZZrZaY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8799a911-0e95-4147-34fa-08d57f8a79b1 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:24.0078 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1016 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit e36ae3439936e13c33f5841c7c2c1a9875acbb6d ] xencons_disconnect_backend() is only called from xen_console_remove(), which is conditionally compiled, so we get a harmless warning when CONFIG_HVC_XEN_FRONTEND is unset: hvc/hvc_xen.c:350:12: error: 'xen_console_remove' defined but not used [-Werror=unused-function] This moves the function down into the same #ifdef section to silence the warning. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/hvc/hvc_xen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 7a3d146a5f0e..5cc3ca1dd5c9 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -322,6 +322,7 @@ void xen_console_resume(void) } } +#ifdef CONFIG_HVC_XEN_FRONTEND static void xencons_disconnect_backend(struct xencons_info *info) { if (info->irq > 0) @@ -362,7 +363,6 @@ static int xen_console_remove(struct xencons_info *info) return 0; } -#ifdef CONFIG_HVC_XEN_FRONTEND static int xencons_remove(struct xenbus_device *dev) { return xen_console_remove(dev_get_drvdata(&dev->dev));