1 files changed, 8 insertions, 6 deletions

diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 2034d4dbe6ad..6763088b7607 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -26,16 +26,16 @@
  * Note that ADDR_LIMIT is either 0 or 0xc0000000.
  * Note also that it is intended that __get_user_bad is not global.
  */
+#include <linux/linkage.h>
 #include <asm/errno.h>
 
-        .global __get_user_1
-__get_user_1:
+ENTRY(__get_user_1)
 1:      ldrbt   r2, [r0]
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__get_user_1)
 
-        .global __get_user_2
-__get_user_2:
+ENTRY(__get_user_2)
 2:      ldrbt   r2, [r0], #1
 3:      ldrbt   r3, [r0]
 #ifndef __ARMEB__
@@ -45,17 +45,19 @@ __get_user_2:
 #endif
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__get_user_2)
 
-        .global __get_user_4
-__get_user_4:
+ENTRY(__get_user_4)
 4:      ldrt    r2, [r0]
         mov     r0, #0
         mov     pc, lr
+ENDPROC(__get_user_4)
 
 __get_user_bad:
         mov     r2, #0
         mov     r0, #-EFAULT
         mov     pc, lr
+ENDPROC(__get_user_bad)
 
 .section __ex_table, "a"
         .long   1b, __get_user_bad