1 files changed, 17 insertions, 9 deletions

diff --git a/arch/i386/lib/getuser.S b/arch/i386/lib/getuser.S
index 62d7f178a32..6d84b53f12a 100644
--- a/arch/i386/lib/getuser.S
+++ b/arch/i386/lib/getuser.S
@@ -8,6 +8,8 @@
  * return an error value in addition to the "real"
  * return value.
  */
+#include <linux/linkage.h>
+#include <asm/dwarf2.h>
 #include <asm/thread_info.h>
 
 
@@ -24,19 +26,19 @@
  */
 
 .text
-.align 4
-.globl __get_user_1
-__get_user_1:
+ENTRY(__get_user_1)
+        CFI_STARTPROC
         GET_THREAD_INFO(%edx)
         cmpl TI_addr_limit(%edx),%eax
         jae bad_get_user
 1:      movzbl (%eax),%edx
         xorl %eax,%eax
         ret
+        CFI_ENDPROC
+ENDPROC(__get_user_1)
 
-.align 4
-.globl __get_user_2
-__get_user_2:
+ENTRY(__get_user_2)
+        CFI_STARTPROC
         addl $1,%eax
         jc bad_get_user
         GET_THREAD_INFO(%edx)
@@ -45,10 +47,11 @@ __get_user_2:
 2:      movzwl -1(%eax),%edx
         xorl %eax,%eax
         ret
+        CFI_ENDPROC
+ENDPROC(__get_user_2)
 
-.align 4
-.globl __get_user_4
-__get_user_4:
+ENTRY(__get_user_4)
+        CFI_STARTPROC
         addl $3,%eax
         jc bad_get_user
         GET_THREAD_INFO(%edx)
@@ -57,11 +60,16 @@ __get_user_4:
 3:      movl -3(%eax),%edx
         xorl %eax,%eax
         ret
+        CFI_ENDPROC
+ENDPROC(__get_user_4)
 
 bad_get_user:
+        CFI_STARTPROC
         xorl %edx,%edx
         movl $-14,%eax
         ret
+        CFI_ENDPROC
+END(bad_get_user)
 
 .section __ex_table,"a"
         .long 1b,bad_get_user