The scope should really extend to the end of the function, not the
return location.
Signed-off-by: Jan Beulich <[email protected]>
--- linux-2.6.35-rc3/arch/x86/kernel/entry_64.S
+++ 2.6.35-rc3-x86_64-unwind-annotations/arch/x86/kernel/entry_64.S
@@ -1442,7 +1441,6 @@ error_swapgs:
error_sti:
TRACE_IRQS_OFF
ret
- CFI_ENDPROC
/*
* There are two places in the kernel that can potentially fault with
@@ -1467,6 +1465,7 @@ bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
+ CFI_ENDPROC
END(error_entry)
On Wed, Jun 30, 2010 at 02:28:08PM +0100, Jan Beulich wrote:
> The scope should really extend to the end of the function, not the
> return location.
>
> Signed-off-by: Jan Beulich <[email protected]>
>
Great catch, thanks Jan!
-- Cyrill