diff options
| author | Lorenzo Pieralisi | 2015-03-25 16:22:13 +0100 |
|---|---|---|
| committer | Will Deacon | 2015-03-26 16:13:11 +0100 |
| commit | fb094eb19900937322848beaf1a622c6afb6250b (patch) | |
| tree | 102d75fcef8fa67090c2a84dacf67aee60a626ff /arch/arm64/kernel/setup.c | |
| parent | ARM64: kernel: acpi: refactor ACPI tables init and checks (diff) | |
| download | kernel-qcow2-linux-fb094eb19900937322848beaf1a622c6afb6250b.tar.gz kernel-qcow2-linux-fb094eb19900937322848beaf1a622c6afb6250b.tar.xz kernel-qcow2-linux-fb094eb19900937322848beaf1a622c6afb6250b.zip | |
ARM64: kernel: acpi: honour acpi=force command line parameter
If acpi=force is passed on the command line, it forces ACPI to be
the only available boot method, hence it must be left enabled even
if the initialization and sanity checks on ACPI tables fails.
This patch refactors ACPI initialization to prevent disabling ACPI
if acpi=force is passed on the command line.
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index d60b1adc7500..b2783111fd52 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -390,7 +390,7 @@ void __init setup_arch(char **cmdline_p) early_ioremap_reset(); - if (acpi_disabled && !param_acpi_force) { + if (acpi_disabled) { unflatten_device_tree(); psci_dt_init(); cpu_read_bootcpu_ops(); |