2 files changed, 14 insertions, 10 deletions

diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index 444fba400983..e2c6e0d5e125 100644
--- a/arch/x86/lib/semaphore_32.S
+++ b/arch/x86/lib/semaphore_32.S
@@ -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
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index ceeeb5ea5b15..3faf599ea58e 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -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; \