arm64: idreg-override: Move to early mini C runtime

[sfrench/cifs-2.6.git] / arch / arm64 / kernel / head.S

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index a8fa64fc30d71cc06b3c38ee23afa278c4f25578..ca5e5fbefcd34e9ed95cebfa1d594322cc594366 100644 (file)
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -510,10 +510,9 @@ SYM_FUNC_START_LOCAL(__primary_switched)
 #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
        bl      kasan_early_init
 #endif
-       mov     x0, x21                         // pass FDT address in x0
-       bl      early_fdt_map                   // Try mapping the FDT early
        mov     x0, x20                         // pass the full boot status
-       bl      init_feature_override           // Parse cpu feature overrides
+       mov     x1, x22                         // pass the low FDT mapping
+       bl      __pi_init_feature_override      // Parse cpu feature overrides
 #ifdef CONFIG_UNWIND_PATCH_PAC_INTO_SCS
        bl      scs_patch_vmlinux
 #endif