X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Flib%2Fcsum-copy.S;h=72fd55ee896ee1c4bd7064dc588573c7926e63d8;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=f0dba36578ea0765827efc68f9448dd38f12e6f0;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/x86_64/lib/csum-copy.S b/arch/x86_64/lib/csum-copy.S
index f0dba3657..72fd55ee8 100644
--- a/arch/x86_64/lib/csum-copy.S
+++ b/arch/x86_64/lib/csum-copy.S
@@ -5,9 +5,8 @@
  * License.  See the file COPYING in the main directory of this archive
  * for more details. No warranty for anything given at all.
  */
-#include <linux/linkage.h>
-#include <asm/dwarf2.h>
-#include <asm/errno.h>
+ 	#include <linux/linkage.h>
+	#include <asm/errno.h>
 
 /*
  * Checksum copy with exception handling.
@@ -54,24 +53,19 @@
 	.endm
 	
 				
-ENTRY(csum_partial_copy_generic)
-	CFI_STARTPROC
+	.globl csum_partial_copy_generic
+	.p2align 4
+csum_partial_copy_generic:
 	cmpl	 $3*64,%edx
 	jle	 .Lignore
 
 .Lignore:		
 	subq  $7*8,%rsp
-	CFI_ADJUST_CFA_OFFSET 7*8
 	movq  %rbx,2*8(%rsp)
-	CFI_REL_OFFSET rbx, 2*8
 	movq  %r12,3*8(%rsp)
-	CFI_REL_OFFSET r12, 3*8
 	movq  %r14,4*8(%rsp)
-	CFI_REL_OFFSET r14, 4*8
 	movq  %r13,5*8(%rsp)
-	CFI_REL_OFFSET r13, 5*8
 	movq  %rbp,6*8(%rsp)
-	CFI_REL_OFFSET rbp, 6*8
 
 	movq  %r8,(%rsp)
 	movq  %r9,1*8(%rsp)
@@ -214,22 +208,14 @@ ENTRY(csum_partial_copy_generic)
 	addl %ebx,%eax
 	adcl %r9d,%eax		/* carry */
 			
-	CFI_REMEMBER_STATE
 .Lende:
 	movq 2*8(%rsp),%rbx
-	CFI_RESTORE rbx
 	movq 3*8(%rsp),%r12
-	CFI_RESTORE r12
 	movq 4*8(%rsp),%r14
-	CFI_RESTORE r14
 	movq 5*8(%rsp),%r13
-	CFI_RESTORE r13
 	movq 6*8(%rsp),%rbp
-	CFI_RESTORE rbp
 	addq $7*8,%rsp
-	CFI_ADJUST_CFA_OFFSET -7*8
 	ret
-	CFI_RESTORE_STATE
 
 	/* Exception handlers. Very simple, zeroing is done in the wrappers */
 .Lbad_source:
@@ -245,5 +231,3 @@ ENTRY(csum_partial_copy_generic)
 	jz   .Lende	
 	movl $-EFAULT,(%rax)
 	jmp .Lende
-	CFI_ENDPROC
-ENDPROC(csum_partial_copy_generic)