aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/kernel/entry.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/xtensa/kernel/entry.S')
-rw-r--r--arch/xtensa/kernel/entry.S24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 4c2f2706ad5b..3777fec85e7c 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -874,7 +874,7 @@ ENTRY(fast_alloca)
874 874
875 _bnei a0, 1, 1f # no 'movsp a1, ax': jump 875 _bnei a0, 1, 1f # no 'movsp a1, ax': jump
876 876
877 /* Move the save area. This implies the use of the L32E 877 /* Move the save area. This implies the use of the L32E
878 * and S32E instructions, because this move must be done with 878 * and S32E instructions, because this move must be done with
879 * the user's PS.RING privilege levels, not with ring 0 879 * the user's PS.RING privilege levels, not with ring 0
880 * (kernel's) privileges currently active with PS.EXCM 880 * (kernel's) privileges currently active with PS.EXCM
@@ -1008,15 +1008,15 @@ ENDPROC(fast_syscall_user)
1008 1008
1009ENTRY(fast_syscall_unrecoverable) 1009ENTRY(fast_syscall_unrecoverable)
1010 1010
1011 /* Restore all states. */ 1011 /* Restore all states. */
1012 1012
1013 l32i a0, a2, PT_AREG0 # restore a0 1013 l32i a0, a2, PT_AREG0 # restore a0
1014 xsr a2, depc # restore a2, depc 1014 xsr a2, depc # restore a2, depc
1015 rsr a3, excsave1 1015 rsr a3, excsave1
1016 1016
1017 wsr a0, excsave1 1017 wsr a0, excsave1
1018 movi a0, unrecoverable_exception 1018 movi a0, unrecoverable_exception
1019 callx0 a0 1019 callx0 a0
1020 1020
1021ENDPROC(fast_syscall_unrecoverable) 1021ENDPROC(fast_syscall_unrecoverable)
1022 1022
@@ -1253,9 +1253,9 @@ fast_syscall_spill_registers_fixup:
1253 1253
1254 movi a3, exc_table 1254 movi a3, exc_table
1255 rsr a0, exccause 1255 rsr a0, exccause
1256 addx4 a0, a0, a3 # find entry in table 1256 addx4 a0, a0, a3 # find entry in table
1257 l32i a0, a0, EXC_TABLE_FAST_USER # load handler 1257 l32i a0, a0, EXC_TABLE_FAST_USER # load handler
1258 jx a0 1258 jx a0
1259 1259
1260fast_syscall_spill_registers_fixup_return: 1260fast_syscall_spill_registers_fixup_return:
1261 1261
@@ -1457,7 +1457,7 @@ ENTRY(_spill_registers)
1457 rsr a0, ps 1457 rsr a0, ps
1458 _bbci.l a0, PS_UM_BIT, 1f 1458 _bbci.l a0, PS_UM_BIT, 1f
1459 1459
1460 /* User space: Setup a dummy frame and kill application. 1460 /* User space: Setup a dummy frame and kill application.
1461 * Note: We assume EXC_TABLE_KSTK contains a valid stack pointer. 1461 * Note: We assume EXC_TABLE_KSTK contains a valid stack pointer.
1462 */ 1462 */
1463 1463