1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index edb146d01857..2437196cc5d4 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -365,11 +365,6 @@ u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
 void __init setup_arch(char **cmdline_p)
 {
-        /*
-         * Unmask asynchronous aborts early to catch possible system errors.
-         */
-        local_async_enable();
        setup_processor();
        setup_machine_fdt(__fdt_pointer);
@@ -385,6 +380,12 @@ void __init setup_arch(char **cmdline_p)
        parse_early_param();
+        /*
+         *  Unmask asynchronous aborts after bringing up possible earlycon.
+         * (Report possible System Errors once we can report this occurred)
+         */
+        local_async_enable();
        efi_init();
        arm64_memblock_init();