From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brendan Higgins Subject: Re: [RFC v3 16/19] arch: um: make UML unflatten device tree when testing Date: Mon, 3 Dec 2018 16:02:31 -0800 Message-ID: References: <20181128193636.254378-1-brendanhiggins@google.com> <20181128193636.254378-17-brendanhiggins@google.com> <20181130034623.GQ18410@garbanzo.do-not-panic.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20181130034623.GQ18410@garbanzo.do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org To: mcgrof@kernel.org Cc: Greg KH , Kees Cook , shuah@kernel.org, Joel Stanley , mpe@ellerman.id.au, joe@perches.com, brakmo@fb.com, rostedt@goodmis.org, Tim.Bird@sony.com, khilman@baylibre.com, Julia Lawall , linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Linux Kernel Mailing List , jdike@addtoit.com, richard@nod.at, linux-um@lists.infradead.org, Daniel Vetter , dri-devel@lists.freedesktop.org, Rob Herring , dan.j.williams@intel.com, linux-nvdimm@lists.01.org, kieran.bingham@ideasonboard.com, Frank Rowand , Knut Omang List-Id: linux-nvdimm@lists.01.org On Thu, Nov 29, 2018 at 7:46 PM Luis Chamberlain wrote: > > On Wed, Nov 28, 2018 at 11:36:33AM -0800, Brendan Higgins wrote: > > Make UML unflatten any present device trees when running KUnit tests. > > > > Signed-off-by: Brendan Higgins > > --- > > arch/um/kernel/um_arch.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c > > index a818ccef30ca2..bd58ae3bf4148 100644 > > --- a/arch/um/kernel/um_arch.c > > +++ b/arch/um/kernel/um_arch.c > > @@ -13,6 +13,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -347,6 +348,9 @@ void __init setup_arch(char **cmdline_p) > > read_initrd(); > > > > paging_init(); > > +#if IS_ENABLED(CONFIG_OF_UNITTEST) > > + unflatten_device_tree(); > > +#endif > > *Why?* Whoops, I didn't realize how bad that looked. In anycase, doing what Rob suggested as a separate patch should clear this up.