From patchwork Wed Oct 11 00:45:53 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: 115476 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp176783qgn; Tue, 10 Oct 2017 17:50:56 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBAvFH5DdsapwjOX3LrgiPm6hiColcsHdJw4L1Cgzfo9yPn5QwMN2MsD95TTLMOK+2vOSei X-Received: by 10.84.234.199 with SMTP id i7mr13556547plt.66.1507683056462; Tue, 10 Oct 2017 17:50:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507683056; cv=none; d=google.com; s=arc-20160816; b=Cf/9h8qojvr2smbx9tJ6UTvwS9E26/rjsXOk4l4uP/iqR7GRRBWzY+C581KBsS4K7E sLkvsl4lLbiK4+2tLx1ZLamfGkuDhvCQP50dAgwSQ/cdGdBHbMM4SUa5EfocdhDhrbnd vV7alwFG/2NtlSFC+UBCfoPk7l3t/npJF5uyUBIdqCM/q0zX/EqzWO7gB8UhmODE4jHy Y3WoNHs5RMx8iNYnetIneNQae7z2W2ZqK/+kD9lY4C7fZ00oXsf6XnpwzzkE3eP4h9tF Jtt3aBT9VSdzl9T9lNVzQDCzuugUVniKGYWB2YBOi7/8PThDt5Vrbil7c1M9BxPPZQHe 1hFw== 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=nW2TaAa+v8TjhNWQu6zsqT+asaLavRbCN1eY+uCDwqc=; b=hStHXSQxIcm+ZQnwBAY0NWTi7kNCtM6GEzW97cuULI690I0B68Bw16UKRt+xckcHC/ kLkcwh6Fgsf8Ct00OpvihBm9eeEDhqLUwuOp5AO+RK2eF9mhmWaDbjoZv74/SMEde4w1 1VLWYIF3pvQeW/1kZalMRWS9n5eeoXPO5Xx+cfTjGV9kHALmExyglA7E1hOKcTBVs1tz h71hl84nfUvQGJf9mublLrEuE8vEL4POdGSRBxIUvkbIJlgF2MopTVHp5cf//SMnfox6 vU4QVcx7q1eWPByu+Gz3+7EUF14rj/DQKyGMALZ4MMweyZaybxq1dDOMFGwxS5A9y+a7 ZiLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@verizon.com header.s=corp header.b=ZXWsZJU+; dkim=fail header.i=@verizon.com header.s=corp header.b=ItE3imQL; dkim=fail header.i=@verizon.com header.s=corp header.b=ItE3imQL; 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 g207si10026002pfb.262.2017.10.10.17.50.56; Tue, 10 Oct 2017 17:50:56 -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=ZXWsZJU+; dkim=fail header.i=@verizon.com header.s=corp header.b=ItE3imQL; dkim=fail header.i=@verizon.com header.s=corp header.b=ItE3imQL; 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 S1756949AbdJKAuy (ORCPT + 26 others); Tue, 10 Oct 2017 20:50:54 -0400 Received: from omzsmtpe01.verizonbusiness.com ([199.249.25.210]:18655 "EHLO omzsmtpe01.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756859AbdJKArs (ORCPT ); Tue, 10 Oct 2017 20:47:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507682868; x=1539218868; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vN/Xk5wj5R7sIdY/nkgsEz1hhqn7i08riyiQGp7tFUU=; b=ZXWsZJU+4/P5fqU7VRz1gEitTpAHUAKizdg64oL1E2SylAkreSqEdwoZ rr/hNRFWpHBIs5kx9s/9dVJzCwGLDlXncFH9ZrNGena8Tplsm+j5k2vOB A1puyjsaY3iIryGiuBvP/Q8BtK/Od7eFOAI+HYXju5cMRza2BT6frOF5T s=; Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by omzsmtpe01.verizonbusiness.com with ESMTP; 11 Oct 2017 00:47:44 +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 fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Oct 2017 00:47:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507682838; x=1539218838; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vN/Xk5wj5R7sIdY/nkgsEz1hhqn7i08riyiQGp7tFUU=; b=ItE3imQL6LDsXaQb+p05DJV4yjZABKEWq+2GrTD85suH9+O5E56TMD+4 J7Xw7Y3hSQ9877nDW9PzA4FJYGgtqzilCNf8KGRNlA27CMveDBkBk+iL2 Pd+i1g3mtwWpLMMtdISTMlSQVPRXW8AZu+adMDeDl8jgbsD8MaX45UMG2 0=; Received: from endeavour.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.163]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 10 Oct 2017 20:47:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1507682838; x=1539218838; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vN/Xk5wj5R7sIdY/nkgsEz1hhqn7i08riyiQGp7tFUU=; b=ItE3imQL6LDsXaQb+p05DJV4yjZABKEWq+2GrTD85suH9+O5E56TMD+4 J7Xw7Y3hSQ9877nDW9PzA4FJYGgtqzilCNf8KGRNlA27CMveDBkBk+iL2 Pd+i1g3mtwWpLMMtdISTMlSQVPRXW8AZu+adMDeDl8jgbsD8MaX45UMG2 0=; X-Host: endeavour.tdc.vzwcorp.com Received: from ohtwi1exh001.uswin.ad.vzwcorp.com ([10.144.218.43]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 11 Oct 2017 00:47:18 +0000 Received: from tbwexch14apd.uswin.ad.vzwcorp.com (153.114.162.38) by OHTWI1EXH001.uswin.ad.vzwcorp.com (10.144.218.43) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 10 Oct 2017 20:47:18 -0400 Received: from OMZP1LUMXCA15.uswin.ad.vzwcorp.com (144.8.22.190) by tbwexch14apd.uswin.ad.vzwcorp.com (153.114.162.38) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 10 Oct 2017 20:47:17 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA15.uswin.ad.vzwcorp.com (144.8.22.190) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 10 Oct 2017 19:47:07 -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:47:07 -0500 To: "gregkh@linuxfoundation.org" CC: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [GIT PULL for-3.18 02/13] watchdog: kempld: fix gcc-4.3 build Thread-Topic: [GIT PULL for-3.18 02/13] watchdog: kempld: fix gcc-4.3 build Thread-Index: AQHTQipKsDJ3+qXtJE+8thbw3ZJ22A== Date: Wed, 11 Oct 2017 00:45:53 +0000 Message-ID: <20171011004547.8116-3-alexander.levin@verizon.com> References: <20171011004547.8116-1-alexander.levin@verizon.com> In-Reply-To: <20171011004547.8116-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 d9c1a1601926..e88d1346be5c 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;