From: Hanjun Guo <hanjun.guo@linaro.org>
Date: Tue, 24 Mar 2015 14:02:56 +0000 (+0000)
Subject: ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed
X-Git-Tag: omap-for-v4.2/o2_dc~26^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33757ded074918eb49243968a82e7c9ec2d71720;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed