On Wed, 25 Feb 2015 16:39:50 +0800 , Hanjun Guo <hanjun....@linaro.org> wrote: > From: Graeme Gregory <graeme.greg...@linaro.org> > > 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 <catalin.mari...@arm.com> > CC: Will Deacon <will.dea...@arm.com> > Tested-by: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com> > Tested-by: Yijing Wang <wangyij...@huawei.com> > Tested-by: Mark Langsdorf <mlang...@redhat.com> > Tested-by: Jon Masters <j...@redhat.com> > Tested-by: Timur Tabi <ti...@codeaurora.org> > Tested-by: Robert Richter <rrich...@cavium.com> > Acked-by: Robert Richter <rrich...@cavium.com> > Signed-off-by: Graeme Gregory <graeme.greg...@linaro.org> > Signed-off-by: Hanjun Guo <hanjun....@linaro.org>
Acked-by: Grant Likely <grant.lik...@linaro.org> > --- > 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
