From patchwork Wed Oct 11 00:45:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 115479 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp189652qgn; Tue, 10 Oct 2017 18:09:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAQ7B0pT1Tl+quIqELN7k36MULAj+5+IiDO4cFwIXU1hjtcSFJ1UoDySZ1QnJWEVpY61Vaa X-Received: by 10.98.29.212 with SMTP id d203mr8997272pfd.226.1507684180515; Tue, 10 Oct 2017 18:09:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507684180; cv=none; d=google.com; s=arc-20160816; b=uVPdU+K7rG8mBS8VZdtYtadvbnESfyYHBlnH54tZSRTYpQwRuZzeRInBMdJqTv5h6M ExtcX1nv0NMXtDMFavdL62NE2rkMPu4qoFOH90L2AiD0bmNIAxnxFCnE3nXe+sKwmfoS 3nBYoGIhbrhQCXXW2ps5//TtJxIkb/lP7+/4oQ0s6F3eCtWJcFqsTgIQ/TWWaz4jQtAK iL7AN+S9q6AahkqmwZK1gEhCcgiGMDYDFMcoDqkWB0DLrzqMSdIdj/t4bEHcuUhGJ4P5 M4krvI2YszcuSstCpNppCkY+iDh33Qpyn86H7a6tK41fYeadyKcgUy1xN1Ms90hcX08Q en4Q== 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 :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:dkim-signature :dkim-signature:from:dkim-signature:arc-authentication-results; bh=L4N2jQeEEfYePKGIzyV2M2XZFFNwmt9cEpwxJ4d67VE=; b=Aq1+MAAsLJ3X0JSpqPwHKJ5mjqNI5xmYqssOnYiBdRSN17FNEdAbGkS/PCuIfZt7aW qgVr4NanHnJe1P6AcrgX1D9s0Arrraz2xWR1pIQtQ3Rsdqr5gVssyAdmoa6OEGphaho2 vwIhgTGbQQmwmuZDvcYWEmE3+1eiP0oDweg2Sz6QfF76uArCLkdTLwiJhg6oePBJvX8Q NrSGxsJ17yCCUEvJA/YMVn4f8N4hExNcL4EP3M2yLcMvZK0aSeA2gWwbLo2P0yDD+U6V sNphISbTPE/4FOsdceL+sH8MWe0SBb06SQlOGJ9bTGD0V3/rxendVmcgw7YU1OA+xqYC xUpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@verizon.com header.s=corp header.b=Syl9w9I5; dkim=fail header.i=@verizon.com header.s=corp header.b=OHZiSKtP; dkim=fail header.i=@verizon.com header.s=corp header.b=OHZiSKtP; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g9si10428245pli.684.2017.10.10.18.09.40; Tue, 10 Oct 2017 18:09:40 -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=@verizon.com header.s=corp header.b=Syl9w9I5; dkim=fail header.i=@verizon.com header.s=corp header.b=OHZiSKtP; dkim=fail header.i=@verizon.com header.s=corp header.b=OHZiSKtP; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932810AbdJKBJg (ORCPT + 26 others); Tue, 10 Oct 2017 21:09:36 -0400 Received: from omzsmtpe02.verizonbusiness.com ([199.249.25.209]:3745 "EHLO omzsmtpe02.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932329AbdJKAp6 (ORCPT ); Tue, 10 Oct 2017 20:45:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507682758; x=1539218758; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=/t51gnuu60uLiyHYMUimXzUkVdMJR6RffjyqhTHnitw=; b=Syl9w9I5sIIyZifrxSldTWLIQTfeXLFIEbTh6k0WnsnINriAdNj4EWWz Ym44Uzfmv5iidd3dCVB5QVV50B1uv/V5LTe0D8/S96FkNG4DPySNW2tuy 01vcvMrL6fgZ+w0XRiRZr4LlsvZz4x1mSQgADY7f2pPNTyvGIEmznLKZY E=; Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by omzsmtpe02.verizonbusiness.com with ESMTP; 11 Oct 2017 00:45:54 +0000 From: "Levin, Alexander (Sasha Levin)" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi02.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Oct 2017 00:45:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507682724; x=1539218724; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=/t51gnuu60uLiyHYMUimXzUkVdMJR6RffjyqhTHnitw=; b=OHZiSKtPZECJf5soF6iyv43QjrmVSQil4L5lmaudWF0/l8o+0QOhOL7r NeGVJ7cUCE/8rK9ed7BX2p6vrry6AQp1bW/fptmQmRZkTAUaj7Ml1D3wT 20TmW4SRXxnFFTPZJvbRvWBb8/veN6ZhvnikqoKYhuk9P5NiSY8KLAxdp A=; Received: from mariner.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.84]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 10 Oct 2017 20:45:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507682724; x=1539218724; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=/t51gnuu60uLiyHYMUimXzUkVdMJR6RffjyqhTHnitw=; b=OHZiSKtPZECJf5soF6iyv43QjrmVSQil4L5lmaudWF0/l8o+0QOhOL7r NeGVJ7cUCE/8rK9ed7BX2p6vrry6AQp1bW/fptmQmRZkTAUaj7Ml1D3wT 20TmW4SRXxnFFTPZJvbRvWBb8/veN6ZhvnikqoKYhuk9P5NiSY8KLAxdp A=; X-Host: mariner.tdc.vzwcorp.com Received: from ohtwi1exh003.uswin.ad.vzwcorp.com ([10.144.218.45]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 11 Oct 2017 00:45:24 +0000 Received: from tbwexch22apd.uswin.ad.vzwcorp.com (153.114.162.46) by OHTWI1EXH003.uswin.ad.vzwcorp.com (10.144.218.45) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 10 Oct 2017 20:45:24 -0400 Received: from OMZP1LUMXCA20.uswin.ad.vzwcorp.com (144.8.22.198) by tbwexch22apd.uswin.ad.vzwcorp.com (153.114.162.46) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 10 Oct 2017 20:45:24 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA20.uswin.ad.vzwcorp.com (144.8.22.198) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 10 Oct 2017 19:45:21 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Tue, 10 Oct 2017 19:45:20 -0500 To: "gregkh@linuxfoundation.org" CC: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [GIT PULL for-4.9 03/48] watchdog: kempld: fix gcc-4.3 build Thread-Topic: [GIT PULL for-4.9 03/48] watchdog: kempld: fix gcc-4.3 build Thread-Index: AQHTQio21wBogT0GFEecYHhsoCkUYg== Date: Wed, 11 Oct 2017 00:45:19 +0000 Message-ID: <20171011004512.7949-4-alexander.levin@verizon.com> References: <20171011004512.7949-1-alexander.levin@verizon.com> In-Reply-To: <20171011004512.7949-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 3736d4eb6af37492aeded7fec0072dedd959c842 ] gcc-4.3 can't decide whether the constant value in kempld_prescaler[PRESCALER_21] is built-time constant or not, and gets confused by the logic in do_div(): drivers/watchdog/kempld_wdt.o: In function `kempld_wdt_set_stage_timeout': kempld_wdt.c:(.text.kempld_wdt_set_stage_timeout+0x130): undefined reference to `__aeabi_uldivmod' This adds a call to ACCESS_ONCE() to force it to not consider it to be constant, and leaves the more efficient normal case in place for modern compilers, using an #ifdef to annotate why we do this hack. Signed-off-by: Arnd Bergmann Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/watchdog/kempld_wdt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index 8e302d0e346c..3efa295ac627 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c @@ -140,12 +140,19 @@ static int kempld_wdt_set_stage_timeout(struct kempld_wdt_data *wdt_data, unsigned int timeout) { struct kempld_device_data *pld = wdt_data->pld; - u32 prescaler = kempld_prescaler[PRESCALER_21]; + u32 prescaler; u64 stage_timeout64; u32 stage_timeout; u32 remainder; u8 stage_cfg; +#if GCC_VERSION < 40400 + /* work around a bug compiling do_div() */ + prescaler = READ_ONCE(kempld_prescaler[PRESCALER_21]); +#else + prescaler = kempld_prescaler[PRESCALER_21]; +#endif + if (!stage) return -EINVAL;