Re: [PATCH 6/6] reliable stack trace support (i386 entry.S annotations)

[Andrew Morton <akpm@osdl.org>]

Andrew Morton <akpm@osdl.org> wrote:
>
>  Andi Kleen <ak@suse.de> wrote:
>  >
>  > You probably need newer binutils.
> 
>  Don't think so.

<fiddles a bit more>

This makes it build.


diff -puN arch/i386/kernel/entry.S~a arch/i386/kernel/entry.S
--- devel/arch/i386/kernel/entry.S~a	2006-05-26 09:02:57.000000000 -0700
+++ devel-akpm/arch/i386/kernel/entry.S	2006-05-26 09:04:08.000000000 -0700
@@ -733,6 +733,7 @@ nmi_debug_stack_check:
 
 nmi_16bit_stack:
 	/* create the pointer to lss back */
+	CFI_STARTPROC simple
 	pushl %ss
 	pushl %esp
 	movzwl %sp, %esp
@@ -747,6 +748,7 @@ nmi_16bit_stack:
 	xorl %edx,%edx			# zero error code
 	call do_nmi
 	RESTORE_REGS
+	CFI_ENDPROC
 	lss 12+4(%esp), %esp		# back to 16bit stack
 1:	iret
 .section __ex_table,"a"
@@ -756,11 +758,13 @@ nmi_16bit_stack:
 
 KPROBE_ENTRY(int3)
 	pushl $-1			# mark this as an int
+	CFI_STARTPROC simple
 	SAVE_ALL
 	xorl %edx,%edx		# zero error code
 	movl %esp,%eax		# pt_regs pointer
 	call do_int3
 	jmp ret_from_exception
+	CFI_ENDPROC
 	.previous .text
 
 ENTRY(overflow)
_