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

[tomoyo/tomoyo-test1.git] / arch / arm64 / kernel / entry.S

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 9eb8e0e..1b6b7a8 100644 (file)
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -650,6 +650,7 @@ el0_sync:
        mov     x0, sp
        bl      el0_sync_handler
        b       ret_to_user
+ENDPROC(el0_sync)
 
 #ifdef CONFIG_COMPAT
        .align  6
@@ -658,16 +659,18 @@ el0_sync_compat:
        mov     x0, sp
        bl      el0_sync_compat_handler
        b       ret_to_user
-ENDPROC(el0_sync)
+ENDPROC(el0_sync_compat)
 
        .align  6
 el0_irq_compat:
        kernel_entry 0, 32
        b       el0_irq_naked
+ENDPROC(el0_irq_compat)
 
 el0_error_compat:
        kernel_entry 0, 32
        b       el0_error_naked
+ENDPROC(el0_error_compat)
 #endif
 
        .align  6