2 files changed, 5 insertions, 2 deletions

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 252396a96c78..7b09487ff8fb 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -230,10 +230,10 @@ void __init acpi_boot_table_init(void)
 
 done:
         if (acpi_disabled) {
-                if (earlycon_init_is_deferred)
+                if (earlycon_acpi_spcr_enable)
                         early_init_dt_scan_chosen_stdout();
         } else {
-                parse_spcr(earlycon_init_is_deferred);
+                acpi_parse_spcr(earlycon_acpi_spcr_enable, true);
                 if (IS_ENABLED(CONFIG_ACPI_BGRT))
                         acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);
         }
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index ec3a286163c3..2aa92094b59d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -36,6 +36,7 @@
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/efi-bgrt.h>
+#include <linux/serial_core.h>
 
 #include <asm/e820/api.h>
 #include <asm/irqdomain.h>
@@ -1625,6 +1626,8 @@ int __init acpi_boot_init(void)
         if (!acpi_noirq)
                 x86_init.pci.init = pci_acpi_init;
 
+        /* Do not enable ACPI SPCR console by default */
+        acpi_parse_spcr(earlycon_acpi_spcr_enable, false);
         return 0;
 }