Re: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY

From	Rob Herring <robh@kernel.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY
Date	2017-04-28 23:20 +0200
Message-ID	<tBlsZ-4Oz-3@gated-at.bofh.it> (permalink)
References	<tBaHf-5yJ-3@gated-at.bofh.it> <tBaHf-5yJ-1@gated-at.bofh.it> <tBgjD-Uv-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, Apr 28, 2017 at 08:40:50AM -0700, Frank Rowand wrote:
> 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 <arnd@arndb.de>
> > ---
> >  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 <frank.rowand@sony.com>
> Tested-by: Frank Rowand <frank.rowand@sony.com>

Both applied, thanks.

Rob

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY Arnd Bergmann <arnd@arndb.de> - 2017-04-28 11:50 +0200
  Re: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY Frank Rowand <frowand.list@gmail.com> - 2017-04-28 17:50 +0200
    Re: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY Rob Herring <robh@kernel.org> - 2017-04-28 23:20 +0200

csiph-web