ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed
authorHanjun Guo <hanjun.guo@linaro.org>
Tue, 24 Mar 2015 14:02:56 +0000 (14:02 +0000)
committerWill Deacon <will.deacon@arm.com>
Thu, 26 Mar 2015 15:13:09 +0000 (15:13 +0000)
commit33757ded074918eb49243968a82e7c9ec2d71720
tree112668694f569b3123ea069877883bd89aec2398
parent735f00bdf23c427af0f54a9e672a93b5d3723f60
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>
arch/arm64/include/asm/acpi.h
arch/arm64/kernel/acpi.c
arch/arm64/kernel/setup.c