tree 112668694f569b3123ea069877883bd89aec2398
parent 735f00bdf23c427af0f54a9e672a93b5d3723f60
author Hanjun Guo <hanjun.guo@linaro.org> 1427205776 +0000
committer Will Deacon <will.deacon@arm.com> 1427382789 +0000

ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed

Since the policy is that once we pass acpi=force in the early
param, we will not unflatten device tree even if ACPI is disabled
in ACPI table init fails, so fix the code by comparinging both
acpi_disabled and param_acpi_force before the device tree is
unflattened.

CC: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>