On Thu, Nov 29, 2018 at 7:46 PM Luis Chamberlain <mcgrof@xxxxxxxxxx> 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 <brendanhiggins@xxxxxxxxxx> > > --- > > 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 <linux/sched.h> > > #include <linux/sched/task.h> > > #include <linux/kmsg_dump.h> > > +#include <linux/of_fdt.h> > > > > #include <asm/pgtable.h> > > #include <asm/processor.h> > > @@ -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.
