From patchwork Thu May 4 20:52:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98581 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp806430qgd; Thu, 4 May 2017 13:52:35 -0700 (PDT) X-Received: by 10.99.111.79 with SMTP id k76mr48824318pgc.48.1493931155600; Thu, 04 May 2017 13:52:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si3136031pls.89.2017.05.04.13.52.35; Thu, 04 May 2017 13:52:35 -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 S1751468AbdEDUwe (ORCPT + 6 others); Thu, 4 May 2017 16:52:34 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:55527 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751453AbdEDUwe (ORCPT ); Thu, 4 May 2017 16:52:34 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LmC02-1detTK15hC-00ZtYZ; Thu, 04 May 2017 22:52:20 +0200 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, James Bottomley , Arnd Bergmann Subject: [PATCH 10/13] [3.18-stable] ips: remove pointless #warning Date: Thu, 4 May 2017 22:52:06 +0200 Message-Id: <20170504205209.498721-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170504205209.498721-1-arnd@arndb.de> References: <20170504205209.498721-1-arnd@arndb.de> X-Provags-ID: V03:K0:l0E2EeS406rp5J5p7BetGay2tXHCLxYmL5qm5SH5Jv/p9bAo5hv ooBQMJiaILGEl+uc2PNfGIDfpPReqrR6RXn1qBcNVV+Xf23UAGcJKNai4Uulcuujm9V5/GG UMjTdByXzyXa9LgHv1IZhzK/snSpVCy7j/lJPhiIK4Zzk5VQ2OMTkh2aLujfQ61GdIYftAp 8d9PZS7ft2O9Cnnd66RqQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:m7QJya2xsI8=:wS/14uNNRP7ASvQQLnEjy0 dmM3wInEVmr9ZvKMLNf79FtZRhB7qbIMjAtlQ2PqnK1gDtfeQREZBX4nFmqdeCD3a4HXl+dw0 5JEs7P8/GYCMH+mwGy3NdsdY6qaOtXmD/KJc9vtTW1XWAU+jsLoCAg7/wZ9IaTUZGS7OHUbSD ym2XssuO9qd9eeQu2rCf16fqvKjJ/bX9xn4gbDKftKaS0rhLJ0Ci9XIiUazVOIOjOS1qwFUDw hLEsk9SpVJovc9nMiLXjRwxcuzusG9S8gtJsHhO4X5zlwgK5KYoWxc76fIUHmlHzuUQjA/FOA iDfB/4NA66ghTIJAM3G1+cLctUd50lJMe0KiDSyxSKexRYc8VhTjTClvVy2ILZMU065D+SrcM 7Zx82xk7vyPzLw0MioBk5xd3nFgXGUkdZXiAL6L6BNQraKVbPJtGFMPmr40embHnXjR4913lC 8RCvnpM7RkvgxePIgasIyDy9lRZbz/obCknc/iCVUQ4rtnFW2ty2CDBuLcfhheoDCbze3oziT kdRGXjdI2DmwXKWgGXnJyggiylLpMOJ888ORl4XtfpA6PQj/2u6yYR8HRCTEF7bAdUONdQort 34/wK5ozWidZnqaMm4HNLzc6j8/gZMSHl+w8MCSY9Is25arM1rRDm2MXmX18+Y5Dc2EW3PCeA GZW5Y9vyvN4kB4kSQtCicMtjgX7LmwpgfeefYt5s/s9ljLLf+DRz0jCWZF1WzNlHoQQM= 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 e5afc3884d74..b4ee611d41d6 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;