diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2015-03-24 17:02:56 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-03-26 18:13:09 +0300 |
| commit | 33757ded074918eb49243968a82e7c9ec2d71720 (patch) | |
| tree | 112668694f569b3123ea069877883bd89aec2398 /arch/arm64/include/asm/acpi.h | |
| parent | 735f00bdf23c427af0f54a9e672a93b5d3723f60 (diff) | |
| download | linux-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/include/asm/acpi.h')
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 59c05d8ea4a0..e1a89656f17e 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -38,6 +38,7 @@ typedef u64 phys_cpuid_t; extern int acpi_disabled; extern int acpi_noirq; extern int acpi_pci_disabled; +extern bool param_acpi_force; /* 1 to indicate PSCI 0.2+ is implemented */ static inline bool acpi_psci_present(void) @@ -91,6 +92,8 @@ void __init acpi_init_cpus(void); static inline bool acpi_psci_present(void) { return false; } static inline bool acpi_psci_use_hvc(void) { return false; } static inline void acpi_init_cpus(void) { } + +#define param_acpi_force false #endif /* CONFIG_ACPI */ #endif /*_ASM_ACPI_H*/ |