From patchwork Fri May 5 19:46:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98705 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292934qge; Fri, 5 May 2017 12:48:54 -0700 (PDT) X-Received: by 10.84.229.15 with SMTP id b15mr30865618plk.14.1494013734756; Fri, 05 May 2017 12:48:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.54; Fri, 05 May 2017 12:48:54 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbdEETsx (ORCPT + 6 others); Fri, 5 May 2017 15:48:53 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56918 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbdEETsi (ORCPT ); Fri, 5 May 2017 15:48:38 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MOo90-1dAYQK48fe-0067VD; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, James Bottomley , Arnd Bergmann Subject: [PATCH 3.16-stable 34/87] ips: remove pointless #warning Date: Fri, 5 May 2017 21:46:52 +0200 Message-Id: <20170505194745.3627137-35-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:Y739RN2QhOPL163ldt/25u7a+DHFhLIooa9AAquWadtpg0cQ+jE /+AcWhSaj8D57VNiCQ/jzenbwnEWLcH5X0hrXRR+FiMtQqBHJ56jcBdvFyuuyCZ3j6gKMOy FkXZcFVyXtpbej5mPDui5gmnhSsnMQHs3RSuWDyG4YpGW3Klx4GrSA1yloyBzeUSzTarOY8 mZr0bPDX3L+YopwyxfU+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ya1liCFwZXE=:uTtZDmnf1gwhESQDECCy8l 7Wgv3o//FgwHIaupcH3IjqG7mxyyR87Zwi/+gcisY89YWtv82b9AWRrhxIYJ96RF+Mo5oqaLQ oouWWYl23I/ewn9Z6irKaJwjdrV4mds0a/krSsztc8jISqhfpyKBhZHDptDnfaPH/Rvx5GQ17 aF0xezDpu+ZyBO51SPcyZG2x5eN1XsSIoD65DMn5LFTpjl/S5/VsA5e6sxpuTEknz2A2XeXXE CUZJpCcrciZ+7qGHGBSXPx12ayEkOHlNCFptK/jQzKZQwl3F8z5lmSgWkSvClzfkWf1qk3abj 9LGLryunrEi+xVGdJWRfcqm47SMgnlV7Z28NZGa1/sTLpW9uMjKJpr/qjYJw+fVOmG3zisI0J a9H4wUhT6KfvDCHfILlgf8SrWbabmu5Iav35jdb/R8tS79gOCRWfrNf/tSYmlI04CNN79qCbG kZLkYUUI8AetcPBppYRoMPQNM5JkoqMi8Va7FqktrHj1QS5r/rOltjvfdd5c9/ikbHKuiVRQN uM42sEsCa99j5EOh/UjPhgwowVJv+c05sG4Di0zUTWZfk4I9eWGyGbO37+h8xAsKjln17EZki cODMO/+Q9k9LbxH2OSU2lNqXqJhHwQebVGUFTymhCZvhS86Q2pEalS9RRKSm2xXU1m0dawHcZ APRPhkhCnO3vzaDgTMBG6+lyAId1L7+YAyJZGNAtn57Ryp5gfaTXL2ZY1NoqVzHyK3YE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: James Bottomley Commit e03c2da6574223081b786960e39c1e5ecf5d492d upstream. non-x86 builds want the #warning in the IPS code about compiling on the wrong architecture removed because it keeps triggering on their platforms build farms. Transform from a compile time warning into a runtime one with taint to preserve the original intent of the authors. Acked-by: Arnd Bergmann Signed-off-by: James Bottomley Signed-off-by: Arnd Bergmann --- drivers/scsi/ips.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 52a216f21ae5..946084014316 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -206,10 +206,6 @@ module_param(ips, charp, 0); #define IPS_VERSION_HIGH IPS_VER_MAJOR_STRING "." IPS_VER_MINOR_STRING #define IPS_VERSION_LOW "." IPS_VER_BUILD_STRING " " -#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__) -#warning "This driver has only been tested on the x86/ia64/x86_64 platforms" -#endif - #define IPS_DMA_DIR(scb) ((!scb->scsi_cmd || ips_is_passthru(scb->scsi_cmd) || \ DMA_NONE == scb->scsi_cmd->sc_data_direction) ? \ PCI_DMA_BIDIRECTIONAL : \ @@ -6789,6 +6785,11 @@ ips_remove_device(struct pci_dev *pci_dev) static int __init ips_module_init(void) { +#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__) + printk(KERN_ERR "ips: This driver has only been tested on the x86/ia64/x86_64 platforms\n"); + add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK); +#endif + if (pci_register_driver(&ips_pci_driver) < 0) return -ENODEV; ips_driver_template.module = THIS_MODULE;