From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754450AbdKNLTF (ORCPT ); Tue, 14 Nov 2017 06:19:05 -0500 Received: from 19pmail.ess.barracuda.com ([64.235.150.245]:58672 "EHLO 19pmail.ess.barracuda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752016AbdKNLS6 (ORCPT ); Tue, 14 Nov 2017 06:18:58 -0500 Date: Tue, 14 Nov 2017 11:17:38 +0000 From: James Hogan To: Matt Redfearn CC: Guenter Roeck , , "# 4 . 11 +" , , , Wim Van Sebroeck Subject: Re: [PATCH] watchdog: indydog: Add dependency on SGI_HAS_INDYDOG Message-ID: <20171114111737.GB5823@jhogan-linux.mipstec.com> References: <1510656774-31464-1-git-send-email-matt.redfearn@mips.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7iMSBzlTiPOCCT2k" Content-Disposition: inline In-Reply-To: <1510656774-31464-1-git-send-email-matt.redfearn@mips.com> User-Agent: Mutt/1.7.2 (2016-11-26) X-Originating-IP: [192.168.154.110] X-BESS-ID: 1510658277-637139-19937-261111-1 X-BESS-VER: 2017.14-r1710272128 X-BESS-Apparent-Source-IP: 12.201.5.28 X-BESS-Outbound-Spam-Score: 0.01 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.186912 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH META: Sender Domain Matches Recipient Domain X-BESS-Outbound-Spam-Status: SCORE=0.01 using account:ESS59374 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-BESS-BRTS-Status: 1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --7iMSBzlTiPOCCT2k Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 14, 2017 at 10:52:54AM +0000, Matt Redfearn wrote: > Commit da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") > enabled building the Indy watchdog driver when COMPILE_TEST is enabled. > However, the driver makes reference to symbols that are only defined for > certain platforms are selected in the config. These platforms select > SGI_HAS_INDYDOG. Without this, link time errors result, for example > when building a MIPS allyesconfig. >=20 > drivers/watchdog/indydog.o: In function `indydog_write': > indydog.c:(.text+0x18): undefined reference to `sgimc' > indydog.c:(.text+0x1c): undefined reference to `sgimc' > drivers/watchdog/indydog.o: In function `indydog_start': > indydog.c:(.text+0x54): undefined reference to `sgimc' > indydog.c:(.text+0x58): undefined reference to `sgimc' > drivers/watchdog/indydog.o: In function `indydog_stop': > indydog.c:(.text+0xa4): undefined reference to `sgimc' > drivers/watchdog/indydog.o:indydog.c:(.text+0xa8): more undefined > references to `sgimc' follow > make: *** [Makefile:1005: vmlinux] Error 1 >=20 > Fix this by ensuring that CONFIG_INDIDOG can only be selected when the > necessary dependent platform symbols are built in. >=20 > Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") > Signed-off-by: Matt Redfearn > Cc: # 4.11 + > --- >=20 > drivers/watchdog/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index ca200d1f310a..d96e2e7544fc 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -1451,7 +1451,7 @@ config RC32434_WDT > =20 > config INDYDOG > tristate "Indy/I2 Hardware Watchdog" > - depends on SGI_HAS_INDYDOG || (MIPS && COMPILE_TEST) > + depends on SGI_HAS_INDYDOG || (MIPS && COMPILE_TEST && SGI_HAS_INDYDOG) (MIPS && COMPILE_TEST && SGI_HAS_INDYDOG) implies SGI_HAS_INDYDOG So I think you can just do: - depends on SGI_HAS_INDYDOG || (MIPS && COMPILE_TEST) + depends on SGI_HAS_INDYDOG I.e. COMPILE_TEST isn't of any value in this case. Cheers James --7iMSBzlTiPOCCT2k Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEd80NauSabkiESfLYbAtpk944dnoFAloK0NEACgkQbAtpk944 dnoElg//WRwok5OHQhwie64lh6z9g+szr+u4xADuY41gaiPGEfDlwHD4IqDhaKO+ hyCfDp+Yr+eDyRX0i3HPjZDmDob2mN0KfPbKtzcW1XCzpPel0pZZyMIWhHZO+kbe 47lp87rEeuHsZhzz75p74mgrX5WkwBN3DfEMA1rIEDseGKmHmWdVd154k2X4JhaX Uq5D3IZTR8bY+652I01UvWBrZ0IWsWiLsAZAeNztOUQZNZotgCfRbFETQuy5D3DY jciylT+hltb/wiXS/MatOPrsaT66KOXjJaVld2ve0WSLwPn9OCvg/ryBaRKMlzDi V/xchst5Nk3cIpEHVu8vxMpH5vEUZ9bH6+XfE0zcBJ2zRbbt3S6E3skBufF+F+xb 75UFq9Rn61x6CSuy8vMt/X8KzTXM1W4jd3MFPKkNnVWJiWzrwdaaw6O+vkC/s7bj aQVeMqqUR4M9etzTQyk22hbsqHoICIM6DPeq2WonkxQrAI+Almtuuekhs9Ck/Xx7 oyYydDE02HgNoPX7V41DGoGwnTkiF1/AWkWu1eE9JVG1cPJKsxEvtNMkzsf9Wgsq 55rfw/JbfYPWgFekwZUYLAQPZuLJqeKGYeDml8gPSZ1+SEUGO8FNmB+FcSLrkZeG 1N14L2aNkLpndBCHGAMAvgytvkJEnwsL1OJbm1Ju04XjnIFK8uc= =OJto -----END PGP SIGNATURE----- --7iMSBzlTiPOCCT2k--