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>
Signed-off-by: Graeme Gregory <graeme.greg...@linaro.org>
Signed-off-by: Hanjun Guo <hanjun....@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 510a681..553967d 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -446,7 +446,8 @@ void __init setup_arch(char **cmdline_p)
efi_idmap_init();
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/
