summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/acpi.c
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2015-03-24 17:02:56 +0300
committerWill Deacon <will.deacon@arm.com>2015-03-26 18:13:09 +0300
commit33757ded074918eb49243968a82e7c9ec2d71720 (patch)
tree112668694f569b3123ea069877883bd89aec2398 /arch/arm64/kernel/acpi.c
parent735f00bdf23c427af0f54a9e672a93b5d3723f60 (diff)
downloadlinux-33757ded074918eb49243968a82e7c9ec2d71720.tar.xz
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>
Diffstat (limited to 'arch/arm64/kernel/acpi.c')
-rw-r--r--arch/arm64/kernel/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 5819ef7aa2c3..fe9d8f0df4a3 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -43,7 +43,7 @@ static int enabled_cpus;
static bool bootcpu_valid __initdata;
static bool param_acpi_off __initdata;
-static bool param_acpi_force __initdata;
+bool param_acpi_force __initdata;
static int __init parse_acpi(char *arg)
{