Commit 6b8be6df authored by John Reiser's avatar John Reiser Committed by Ingo Molnar
Browse files

x86: add ENDPROC() markers 



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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent fdfe8aa8

arch/x86/lib/semaphore_32.S

+10 −10
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ ENTRY(__down_failed) 
	ENDFRAME

	ret

	CFI_ENDPROC

	END(__down_failed)

	ENDPROC(__down_failed)



ENTRY(__down_failed_interruptible)

	CFI_STARTPROC
@@ -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
@@ -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
@@ -112,7 +112,7 @@ ENTRY(__up_wakeup) 
	ENDFRAME

	ret

	CFI_ENDPROC

	END(__up_wakeup)

	ENDPROC(__up_wakeup)



/*

 * rw spinlock fallbacks
@@ -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
@@ -148,7 +148,7 @@ ENTRY(__read_lock_failed) 
	ENDFRAME

	ret

	CFI_ENDPROC

	END(__read_lock_failed)

	ENDPROC(__read_lock_failed)



#endif
@@ -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
@@ -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
@@ -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)
@@ -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

include/linux/linkage.h

+4 −0
Original line number Diff line number Diff line
@@ -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; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE