diff options
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 b2783111fd52..d60b1adc7500 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
@@ -390,7 +390,7 @@ void __init setup_arch(char **cmdline_p) | |||
390 | 390 | ||
391 | early_ioremap_reset(); | 391 | early_ioremap_reset(); |
392 | 392 | ||
393 | if (acpi_disabled) { | 393 | if (acpi_disabled && !param_acpi_force) { |
394 | unflatten_device_tree(); | 394 | unflatten_device_tree(); |
395 | psci_dt_init(); | 395 | psci_dt_init(); |
396 | cpu_read_bootcpu_ops(); | 396 | cpu_read_bootcpu_ops(); |