From patchwork Mon Mar 19 16:07:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132052 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2991766edb; Mon, 19 Mar 2018 09:10:33 -0700 (PDT) X-Google-Smtp-Source: AG47ELvX5qe2x+eg4fdfxoXi/V/Dv9/4PThUdOhE76yfsw0FXR9nYZLSfcRInDf2hrgdoltjU9y5 X-Received: by 2002:a17:902:7088:: with SMTP id z8-v6mr13102135plk.174.1521475833753; Mon, 19 Mar 2018 09:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521475833; cv=none; d=google.com; s=arc-20160816; b=q5T1s8IgYHwHKaKgWRfpw1tjiOjzj/FqqvF5ze6QUxCK7wTEB35xg+DjUqvKusOsva i+DYyUBThRj85jbhUcJ7Odjo7R4LxGVY/te/paC9GJ4sjK5n/achsrWAX7UEhYVlKXMf xFaPPLY0tftitm7AJi41IcKSWMTyfU17OTuGIch8fwq/DpIEINp99Z090c9LY6Iwvl8i aAIr2WEISTCXJvFIbgtOTG9AtI9oqx5X+M9Yx9qYv/QsGlBJbnRkkKoQ+EgyLtI2iccY VlQ3PdSzHDdWhQyQVcQeTi+EKDN5n0UaXtw/Yp76KB76VV+Z0QAjYHD0GJ/Yv7IK6kHg bs9g== 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=TTcIAW+hJVTgl4n22w89zRiulgGwTZc74A2aZE2Deg8=; b=vD0TgaU0GHWN89GEwZsGdXBBQ3xDnzu/ri5OQ6FscNvbMtNzNBXR1pN+FoFbOBNesJ 89XHpp63zthaq/H9q+w3/sZRseeF99aXRyfCcrhWP5GxeK639xGw1XOEoYTqwAXnVGy4 MYQDoIyZxcwX191H+uUnej5zKUtsrj9TlZTfppi20j+tps/cM2aWdh1ZQqijcDolcaDa nrH2jqizZaNTE/caEL6Yol5DzXyMwcU58r0X0bW595K9uP7SwNwW0g2K6PTBVvI+Ih4h BVNQdWcq1yW3CGbjBpkDqCq3pR0ynViFCgHZd7sfS8G6+kd/ZUch/P1h4RDKaQgW/Rj/ SEpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=DomXNwEq; 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 z4si194168pfb.192.2018.03.19.09.10.33; Mon, 19 Mar 2018 09:10:33 -0700 (PDT) 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=DomXNwEq; 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 S966473AbeCSQKa (ORCPT + 10 others); Mon, 19 Mar 2018 12:10:30 -0400 Received: from mail-bn3nam01on0110.outbound.protection.outlook.com ([104.47.33.110]:35072 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966564AbeCSQKH (ORCPT ); Mon, 19 Mar 2018 12:10:07 -0400 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=TTcIAW+hJVTgl4n22w89zRiulgGwTZc74A2aZE2Deg8=; b=DomXNwEqMZnfUXSPwS2zEpdxhOlwBfCA3evTAU+jYl6Pp88+b9fvkL742EWk39EZj8TS6mNfJYroK4Wtr3cLgME56gAuYgtTi8C2QzVbRG5wsGXtiZE8JOcX3vSRZOGdsp1WK1YHZGPIW3XHDoHm+oGvycjQTM9GJZvJfKWQG9o= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1095.namprd21.prod.outlook.com (52.132.130.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:09:54 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:09:54 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 103/167] net/mlx5: avoid build warning for uniprocessor Thread-Topic: [PATCH AUTOSEL for 4.4 103/167] net/mlx5: avoid build warning for uniprocessor Thread-Index: AQHTv5xiCJVGQ7qMEkuUdUomv7/K3g== Date: Mon, 19 Mar 2018 16:07:31 +0000 Message-ID: <20180319160513.16384-103-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-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; DM5PR2101MB1095; 7:Gn6TT9+pEkNljle7J8tCsLx26lAJlrdAsmAEXWJeuEGqml5nMXAjbT2ABlhdLSTKnC8Q+ypXCMuRPoB0yV+9d8MUN0PsdBJM3DeBN6PbmDVlOLcBP/Yz7YbY25NKGbHdnBMOLui7gQEPwx0iAcgOWTsfyDdKvxlDrjIy2nUvDF4yRtNFdd4tLpnBAtCWVo4dId0z1eJwQxfVQ0s5ZX8PLqlGCyhggKRHYofZp8ZC0jIzBjViduWu5oxTqS2ZHmAd; 20:k/ibloawdcdvhk03RBjauKzKWyheINzbV5BgIQNBqxQIfuO5dJCEUhoFrDXj5bWZtKIV9BbPpqF5blzy/tW11Q1uCD/+O2amWZwTXV/+ySDEgjcJZqJmdpBE8Pifmbu/Gvd8eAhlBmb3eT8EuS/NxLtgKyOQHgRoDYzKZ8a7iWI= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 7784e3b1-4dc8-4458-d6d9-08d58db3da70 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1095; x-ms-traffictypediagnostic: DM5PR2101MB1095: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; 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)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1095; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1095; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(376002)(346002)(366004)(39860400002)(396003)(39380400002)(189003)(199004)(305945005)(316002)(1076002)(7736002)(14454004)(86612001)(25786009)(8936002)(2950100002)(110136005)(66066001)(186003)(10090500001)(6666003)(5250100002)(2501003)(99286004)(76176011)(86362001)(575784001)(4326008)(68736007)(3660700001)(105586002)(8676002)(81166006)(81156014)(106356001)(3280700002)(72206003)(10290500003)(478600001)(2900100001)(59450400001)(97736004)(54906003)(6512007)(53936002)(6506007)(102836004)(6436002)(5660300001)(6486002)(107886003)(26005)(2906002)(22452003)(6116002)(3846002)(36756003)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1095; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: dqhP5RW8pGVqcXiGD2YsqxmnDZfk/rYvqitV4OUFfBNW8MZ1Ia5/9RNNp3Sj19p55yDDTRRQJKvxmeJ37FX5yK6EdcP68nASAM42tJJEcA/TN3oqoqK2iiaSPjzbshRqTwJAb8eMvQVBw2wOGgLYBhEZ8tvfJJ5nOWJsJTWZfM+iXtaa4ZSHN00Xsp/o5PKXZDxlEn4evWzgLggB5IFgqyQVXfXR/5EiSrpnLxa/G5+vJ/9wWVDhfgnuTfjLhvlBj0wjWwV1LtjX5lAEYqSsGHKjjTn5tr2ERoLs5hTS4YpdE3EezubZPap/E2zM3ZuMLKhlYzxbifMtw0VJc8BIFA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7784e3b1-4dc8-4458-d6d9-08d58db3da70 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:31.3748 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1095 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit f0d7ae95fff4ab444b8433f07afc4b077ef1a285 ] Building the driver with CONFIG_SMP disabled results in a harmless warning: ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint': ethernet/mellanox/mlx5/core/main.c:615:6: error: unused variable 'irq' [-Werror=unused-variable] It's better to express the conditional compilation using IS_ENABLED() here, as that lets the compiler see what the intented use for the variable is, and that it can be silently discarded. Fixes: b665d98edc9a ("net/mlx5: Tolerate irq_set_affinity_hint() failures") Signed-off-by: Arnd Bergmann Acked-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 2aa42dd321e9..7c42be586be8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -522,10 +522,9 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node), priv->irq_info[i].mask); -#ifdef CONFIG_SMP - if (irq_set_affinity_hint(irq, priv->irq_info[i].mask)) + if (IS_ENABLED(CONFIG_SMP) && + irq_set_affinity_hint(irq, priv->irq_info[i].mask)) mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", irq); -#endif return 0; }