On Wed, 25 Feb 2015 16:39:50 +0800 , Hanjun Guo <[email protected]> wrote: > From: Graeme Gregory <[email protected]> > > If the early boot methods of acpi are happy that we have valid ACPI > tables and acpi=force has been passed, then do not unflat devicetree > effectively disabling further hardware probing from DT. > > CC: Catalin Marinas <[email protected]> > CC: Will Deacon <[email protected]> > Tested-by: Suravee Suthikulpanit <[email protected]> > Tested-by: Yijing Wang <[email protected]> > Tested-by: Mark Langsdorf <[email protected]> > Tested-by: Jon Masters <[email protected]> > Tested-by: Timur Tabi <[email protected]> > Tested-by: Robert Richter <[email protected]> > Acked-by: Robert Richter <[email protected]> > Signed-off-by: Graeme Gregory <[email protected]> > Signed-off-by: Hanjun Guo <[email protected]>
Acked-by: Grant Likely <[email protected]> > --- > arch/arm64/kernel/setup.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 4f1a014..e8c7000 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -390,7 +390,8 @@ void __init setup_arch(char **cmdline_p) > > early_ioremap_reset(); > > - unflatten_device_tree(); > + if (acpi_disabled) > + unflatten_device_tree(); > > psci_init(); > > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
