Message ID | 1407166105-17675-17-git-send-email-hanjun.guo@linaro.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
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();