From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426248AbdD1Plb (ORCPT ); Fri, 28 Apr 2017 11:41:31 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36490 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755797AbdD1PlZ (ORCPT ); Fri, 28 Apr 2017 11:41:25 -0400 Subject: Re: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY To: Arnd Bergmann , Rob Herring References: <20170428094429.2396195-1-arnd@arndb.de> <20170428094429.2396195-2-arnd@arndb.de> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org From: Frank Rowand Message-ID: <59036282.3050502@gmail.com> Date: Fri, 28 Apr 2017 08:40:50 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20170428094429.2396195-2-arnd@arndb.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/28/17 02:44, Arnd Bergmann wrote: > We get a link error when the new tests are used by overlays > are not: > > drivers/of/built-in.o: In function `unflatten_device_tree': > (.init.text+0x967): undefined reference to `unittest_unflatten_overlay_base' > > This makes the #ifdef check match the symbols that lead to building > the unittest_unflatten_overlay_base function. > > Fixes: 81d0848fc8d2 ("of: Add unit tests for applying overlays") > Signed-off-by: Arnd Bergmann > --- > drivers/of/of_private.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h > index de5c604f5cc4..4ebb0149d118 100644 > --- a/drivers/of/of_private.h > +++ b/drivers/of/of_private.h > @@ -55,7 +55,7 @@ static inline int of_property_notify(int action, struct device_node *np, > } > #endif /* CONFIG_OF_DYNAMIC */ > > -#ifdef CONFIG_OF_UNITTEST > +#if defined(CONFIG_OF_UNITTEST) && defined(CONFIG_OF_OVERLAY) > extern void __init unittest_unflatten_overlay_base(void); > #else > static inline void unittest_unflatten_overlay_base(void) {}; > I thought I had tested that OF_UNITTEST forced OF_OVERLAY. But going back and trying again, I can confirm your results that it does not. Thanks for catching this! Reviewed-by: Frank Rowand Tested-by: Frank Rowand -Frank