From: Rob Herring <robh@kernel.org>
To: Frank Rowand <frowand.list@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY
Date: Fri, 28 Apr 2017 16:18:31 -0500 [thread overview]
Message-ID: <20170428211831.2tvndexevfv5xx55@rob-hp-laptop> (raw)
In-Reply-To: <59036282.3050502@gmail.com>
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
next prev parent reply other threads:[~2017-04-28 21:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 9:44 [PATCH 1/2] of: fix uninitialized variable warning for overlay test Arnd Bergmann
2017-04-28 9:44 ` [PATCH 2/2] of: fix unittest build without CONFIG_OF_OVERLAY Arnd Bergmann
2017-04-28 15:40 ` Frank Rowand
2017-04-28 21:18 ` Rob Herring [this message]
2017-04-28 15:46 ` [PATCH 1/2] of: fix uninitialized variable warning for overlay test Frank Rowand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170428211831.2tvndexevfv5xx55@rob-hp-laptop \
--to=robh@kernel.org \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®