diff options
| author | Will Deacon <will@kernel.org> | 2020-01-22 11:34:21 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-22 11:34:21 +0000 |
| commit | aa246c056c43d41140c26706e519b498f056de8a (patch) | |
| tree | 6de3f0de377603cb4f38781dae786d9d9b1affa7 /arch/arm64/kernel/entry.S | |
| parent | 4f6cdf296cc4b5b25c85bd04a84b59e562ce234b (diff) | |
| parent | 73d6890fe8ff40e357039b626537ac82d8782aeb (diff) | |
Merge branch 'for-next/asm-annotations' into for-next/core
* for-next/asm-annotations: (6 commits)
arm64: kernel: Correct annotation of end of el0_sync
...
Diffstat (limited to 'arch/arm64/kernel/entry.S')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 9eb8e0e94e1d..1b6b7a86625c 100644 --- 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 |