diff options
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 106a1466518d..746565a876dc 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
| @@ -48,6 +48,7 @@ saved_pc .req lr | |||
| 48 | * from those features make this path too inefficient. | 48 | * from those features make this path too inefficient. |
| 49 | */ | 49 | */ |
| 50 | ret_fast_syscall: | 50 | ret_fast_syscall: |
| 51 | __ret_fast_syscall: | ||
| 51 | UNWIND(.fnstart ) | 52 | UNWIND(.fnstart ) |
| 52 | UNWIND(.cantunwind ) | 53 | UNWIND(.cantunwind ) |
| 53 | disable_irq_notrace @ disable interrupts | 54 | disable_irq_notrace @ disable interrupts |
| @@ -78,6 +79,7 @@ fast_work_pending: | |||
| 78 | * call. | 79 | * call. |
| 79 | */ | 80 | */ |
| 80 | ret_fast_syscall: | 81 | ret_fast_syscall: |
| 82 | __ret_fast_syscall: | ||
| 81 | UNWIND(.fnstart ) | 83 | UNWIND(.fnstart ) |
| 82 | UNWIND(.cantunwind ) | 84 | UNWIND(.cantunwind ) |
| 83 | str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 | 85 | str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 |
| @@ -255,7 +257,7 @@ local_restart: | |||
| 255 | tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls? | 257 | tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls? |
| 256 | bne __sys_trace | 258 | bne __sys_trace |
| 257 | 259 | ||
| 258 | invoke_syscall tbl, scno, r10, ret_fast_syscall | 260 | invoke_syscall tbl, scno, r10, __ret_fast_syscall |
| 259 | 261 | ||
| 260 | add r1, sp, #S_OFF | 262 | add r1, sp, #S_OFF |
| 261 | 2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) | 263 | 2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) |
