[PATCH v2 16/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT

From: Hanjun Guo
Date: Mon Aug 04 2014 - 11:31:51 EST


From: Graeme Gregory <graeme.gregory@xxxxxxxxxx>

If the early boot methods of acpi are happy that we have valid ACPI
tables and acpi=on has been passed. Then do not unflat devicetree
effectively disabling further hardware probing from DT.

Signed-off-by: Graeme Gregory <graeme.gregory@xxxxxxxxxx>
Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
---
arch/arm64/kernel/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 056e2e1..0742e8c 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -399,8 +399,8 @@ void __init setup_arch(char **cmdline_p)

cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;
acpi_boot_init();
-
- unflatten_device_tree();
+ if (acpi_disabled)
+ unflatten_device_tree();

psci_init();

--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/