Merge branch 'for-next/asm-annotations' into for-next/core

[tomoyo/tomoyo-test1.git] / arch / arm64 / mm / proc.S

diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index da854bd..aafed69 100644 (file)
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -57,7 +57,7 @@
  *
  * x0: virtual address of context pointer
  */
-ENTRY(cpu_do_suspend)
+SYM_FUNC_START(cpu_do_suspend)
        mrs     x2, tpidr_el0
        mrs     x3, tpidrro_el0
        mrs     x4, contextidr_el1
@@ -81,7 +81,7 @@ alternative_endif
        stp     x10, x11, [x0, #64]
        stp     x12, x13, [x0, #80]
        ret
-ENDPROC(cpu_do_suspend)
+SYM_FUNC_END(cpu_do_suspend)
 
 /**
  * cpu_do_resume - restore CPU register context
@@ -89,7 +89,7 @@ ENDPROC(cpu_do_suspend)
  * x0: Address of context pointer
  */
        .pushsection ".idmap.text", "awx"
-ENTRY(cpu_do_resume)
+SYM_FUNC_START(cpu_do_resume)
        ldp     x2, x3, [x0]
        ldp     x4, x5, [x0, #16]
        ldp     x6, x8, [x0, #32]
@@ -138,7 +138,7 @@ alternative_else_nop_endif
 
        isb
        ret
-ENDPROC(cpu_do_resume)
+SYM_FUNC_END(cpu_do_resume)
        .popsection
 #endif
 
@@ -149,7 +149,7 @@ ENDPROC(cpu_do_resume)
  *
  *     - pgd_phys - physical address of new TTB
  */
-ENTRY(cpu_do_switch_mm)
+SYM_FUNC_START(cpu_do_switch_mm)
        mrs     x2, ttbr1_el1
        mmid    x1, x1                          // get mm->context.id
        phys_to_ttbr x3, x0
@@ -168,7 +168,7 @@ alternative_else_nop_endif
        msr     ttbr0_el1, x3                   // now update TTBR0
        isb
        b       post_ttbr_update_workaround     // Back to C code...
-ENDPROC(cpu_do_switch_mm)
+SYM_FUNC_END(cpu_do_switch_mm)
 
        .pushsection ".idmap.text", "awx"
 
@@ -189,7 +189,7 @@ ENDPROC(cpu_do_switch_mm)
  * This is the low-level counterpart to cpu_replace_ttbr1, and should not be
  * called by anything else. It can only be executed from a TTBR0 mapping.
  */
-ENTRY(idmap_cpu_replace_ttbr1)
+SYM_FUNC_START(idmap_cpu_replace_ttbr1)
        save_and_disable_daif flags=x2
 
        __idmap_cpu_set_reserved_ttbr1 x1, x3
@@ -201,7 +201,7 @@ ENTRY(idmap_cpu_replace_ttbr1)
        restore_daif x2
 
        ret
-ENDPROC(idmap_cpu_replace_ttbr1)
+SYM_FUNC_END(idmap_cpu_replace_ttbr1)
        .popsection
 
 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
@@ -229,7 +229,7 @@ ENDPROC(idmap_cpu_replace_ttbr1)
  */
 __idmap_kpti_flag:
        .long   1
-ENTRY(idmap_kpti_install_ng_mappings)
+SYM_FUNC_START(idmap_kpti_install_ng_mappings)
        cpu             .req    w0
        num_cpus        .req    w1
        swapper_pa      .req    x2
@@ -401,7 +401,7 @@ __idmap_kpti_secondary:
 
        .unreq  swapper_ttb
        .unreq  flag_ptr
-ENDPROC(idmap_kpti_install_ng_mappings)
+SYM_FUNC_END(idmap_kpti_install_ng_mappings)
        .popsection
 #endif
 
@@ -412,7 +412,7 @@ ENDPROC(idmap_kpti_install_ng_mappings)
  *     value of the SCTLR_EL1 register.
  */
        .pushsection ".idmap.text", "awx"
-ENTRY(__cpu_setup)
+SYM_FUNC_START(__cpu_setup)
        tlbi    vmalle1                         // Invalidate local TLB
        dsb     nsh
 
@@ -469,4 +469,4 @@ ENTRY(__cpu_setup)
 #endif /* CONFIG_ARM64_HW_AFDBM */
        msr     tcr_el1, x10
        ret                                     // return to head.S
-ENDPROC(__cpu_setup)
+SYM_FUNC_END(__cpu_setup)