Skip to content

Commit

Permalink
x86: add ENDPROC() markers
Browse files Browse the repository at this point in the history
The ENDPROCs() were not used everywhere.  Some code used just END() instead,
while other code used nothing.  um/sys-i386/checksum.S didn't #include
<linux/linkage.h> .  I also got confused because gcc puts the
.type near the ENTRY, while ENDPROC puts it on the opposite end.

Signed off by: John Reiser <jreiser@BitWagon.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
John Reiser authored and Ingo Molnar committed Jan 30, 2008
1 parent fdfe8aa commit 6b8be6d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
20 changes: 10 additions & 10 deletions arch/x86/lib/semaphore_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ENTRY(__down_failed)
ENDFRAME
ret
CFI_ENDPROC
END(__down_failed)
ENDPROC(__down_failed)

ENTRY(__down_failed_interruptible)
CFI_STARTPROC
Expand All @@ -70,7 +70,7 @@ ENTRY(__down_failed_interruptible)
ENDFRAME
ret
CFI_ENDPROC
END(__down_failed_interruptible)
ENDPROC(__down_failed_interruptible)

ENTRY(__down_failed_trylock)
CFI_STARTPROC
Expand All @@ -91,7 +91,7 @@ ENTRY(__down_failed_trylock)
ENDFRAME
ret
CFI_ENDPROC
END(__down_failed_trylock)
ENDPROC(__down_failed_trylock)

ENTRY(__up_wakeup)
CFI_STARTPROC
Expand All @@ -112,7 +112,7 @@ ENTRY(__up_wakeup)
ENDFRAME
ret
CFI_ENDPROC
END(__up_wakeup)
ENDPROC(__up_wakeup)

/*
* rw spinlock fallbacks
Expand All @@ -132,7 +132,7 @@ ENTRY(__write_lock_failed)
ENDFRAME
ret
CFI_ENDPROC
END(__write_lock_failed)
ENDPROC(__write_lock_failed)

ENTRY(__read_lock_failed)
CFI_STARTPROC
Expand All @@ -148,7 +148,7 @@ ENTRY(__read_lock_failed)
ENDFRAME
ret
CFI_ENDPROC
END(__read_lock_failed)
ENDPROC(__read_lock_failed)

#endif

Expand All @@ -170,7 +170,7 @@ ENTRY(call_rwsem_down_read_failed)
CFI_ADJUST_CFA_OFFSET -4
ret
CFI_ENDPROC
END(call_rwsem_down_read_failed)
ENDPROC(call_rwsem_down_read_failed)

ENTRY(call_rwsem_down_write_failed)
CFI_STARTPROC
Expand All @@ -182,7 +182,7 @@ ENTRY(call_rwsem_down_write_failed)
CFI_ADJUST_CFA_OFFSET -4
ret
CFI_ENDPROC
END(call_rwsem_down_write_failed)
ENDPROC(call_rwsem_down_write_failed)

ENTRY(call_rwsem_wake)
CFI_STARTPROC
Expand All @@ -196,7 +196,7 @@ ENTRY(call_rwsem_wake)
CFI_ADJUST_CFA_OFFSET -4
1: ret
CFI_ENDPROC
END(call_rwsem_wake)
ENDPROC(call_rwsem_wake)

/* Fix up special calling conventions */
ENTRY(call_rwsem_downgrade_wake)
Expand All @@ -214,6 +214,6 @@ ENTRY(call_rwsem_downgrade_wake)
CFI_ADJUST_CFA_OFFSET -4
ret
CFI_ENDPROC
END(call_rwsem_downgrade_wake)
ENDPROC(call_rwsem_downgrade_wake)

#endif
4 changes: 4 additions & 0 deletions include/linux/linkage.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
.size name, .-name
#endif

/* If symbol 'name' is treated as a subroutine (gets called, and returns)
* then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of
* static analysis tools such as stack depth analyzer.
*/
#ifndef ENDPROC
#define ENDPROC(name) \
.type name, @function; \
Expand Down

0 comments on commit 6b8be6d

Please sign in to comment.