X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Flib%2Fgetuser.S;fp=arch%2Fx86_64%2Flib%2Fgetuser.S;h=3844d5e885a4deafcc035334e7d86b48351daf52;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=5448876261f8734b2b4367c3295dd074c8d33542;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/x86_64/lib/getuser.S b/arch/x86_64/lib/getuser.S
index 544887626..3844d5e88 100644
--- a/arch/x86_64/lib/getuser.S
+++ b/arch/x86_64/lib/getuser.S
@@ -27,26 +27,25 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/dwarf2.h>
 #include <asm/page.h>
 #include <asm/errno.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 
 	.text
-ENTRY(__get_user_1)
-	CFI_STARTPROC
+	.p2align 4
+.globl __get_user_1
+__get_user_1:	
 	GET_THREAD_INFO(%r8)
 	cmpq threadinfo_addr_limit(%r8),%rcx
 	jae bad_get_user
 1:	movzb (%rcx),%edx
 	xorl %eax,%eax
 	ret
-	CFI_ENDPROC
-ENDPROC(__get_user_1)
 
-ENTRY(__get_user_2)
-	CFI_STARTPROC
+	.p2align 4
+.globl __get_user_2
+__get_user_2:
 	GET_THREAD_INFO(%r8)
 	addq $1,%rcx
 	jc 20f
@@ -58,11 +57,10 @@ ENTRY(__get_user_2)
 	ret
 20:	decq    %rcx
 	jmp	bad_get_user
-	CFI_ENDPROC
-ENDPROC(__get_user_2)
 
-ENTRY(__get_user_4)
-	CFI_STARTPROC
+	.p2align 4
+.globl __get_user_4
+__get_user_4:
 	GET_THREAD_INFO(%r8)
 	addq $3,%rcx
 	jc 30f
@@ -74,11 +72,10 @@ ENTRY(__get_user_4)
 	ret
 30:	subq $3,%rcx
 	jmp bad_get_user
-	CFI_ENDPROC
-ENDPROC(__get_user_4)
 
-ENTRY(__get_user_8)
-	CFI_STARTPROC
+	.p2align 4
+.globl __get_user_8
+__get_user_8:
 	GET_THREAD_INFO(%r8)
 	addq $7,%rcx
 	jc 40f
@@ -90,16 +87,11 @@ ENTRY(__get_user_8)
 	ret
 40:	subq $7,%rcx
 	jmp bad_get_user
-	CFI_ENDPROC
-ENDPROC(__get_user_8)
 
 bad_get_user:
-	CFI_STARTPROC
 	xorl %edx,%edx
 	movq $(-EFAULT),%rax
 	ret
-	CFI_ENDPROC
-END(bad_get_user)
 
 .section __ex_table,"a"
 	.quad 1b,bad_get_user