aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2016-09-16 20:13:29 -0400
committerVineet Gupta <vgupta@synopsys.com>2016-09-30 17:48:21 -0400
commit2dad1122d9d936cf120953324eaaa38c3ab20ac2 (patch)
treeda70c4b0febc07d90ef4fda8e8bbb6d483f6a0b2
parent2d0486424791b0d012d060854ce3bd1c6217a82c (diff)
ARC: entry: make ret_from_system_call local label
This essentially removes ENTRY() assembler annotation for this symbol since it didn't have a pairing END() This in ahead of introducing cfi pseudo ops in ENTRY/END which expects paired cfi_startproc/cfi_endproc | ../arch/arc/kernel/entry.S: Assembler messages: | ../arch/arc/kernel/entry.S:270: Error: previous CFI entry not closed (missing .cfi_endproc) | ../scripts/Makefile.build:326: recipe for target 'arch/arc/kernel/entry-arcv2.o' failed | make[4]: *** [arch/arc/kernel/entry-arcv2.o] Error 1 Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/kernel/entry.S12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S
index 741712d4d6ff..1eea99beecc3 100644
--- a/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@ -35,7 +35,7 @@ ENTRY(sys_clone_wrapper)
35 btst r10, TIF_SYSCALL_TRACE 35 btst r10, TIF_SYSCALL_TRACE
36 bnz tracesys_exit 36 bnz tracesys_exit
37 37
38 b ret_from_system_call 38 b .Lret_from_system_call
39END(sys_clone_wrapper) 39END(sys_clone_wrapper)
40 40
41ENTRY(ret_from_fork) 41ENTRY(ret_from_fork)
@@ -248,20 +248,18 @@ ENTRY(EV_Trap)
248 ; syscall num shd not exceed the total system calls avail 248 ; syscall num shd not exceed the total system calls avail
249 cmp r8, NR_syscalls 249 cmp r8, NR_syscalls
250 mov.hi r0, -ENOSYS 250 mov.hi r0, -ENOSYS
251 bhi ret_from_system_call 251 bhi .Lret_from_system_call
252 252
253 ; Offset into the syscall_table and call handler 253 ; Offset into the syscall_table and call handler
254 ld.as r9,[sys_call_table, r8] 254 ld.as r9,[sys_call_table, r8]
255 jl [r9] ; Entry into Sys Call Handler 255 jl [r9] ; Entry into Sys Call Handler
256 256
257 ; fall through to ret_from_system_call 257.Lret_from_system_call:
258END(EV_Trap)
259
260ENTRY(ret_from_system_call)
261 258
262 st r0, [sp, PT_r0] ; sys call return value in pt_regs 259 st r0, [sp, PT_r0] ; sys call return value in pt_regs
263 260
264 ; fall through yet again to ret_from_exception 261 ; fall through to ret_from_exception
262END(EV_Trap)
265 263
266;############# Return from Intr/Excp/Trap (Linux Specifics) ############## 264;############# Return from Intr/Excp/Trap (Linux Specifics) ##############
267; 265;