Re: Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs

[Alexander van Heukelum]

On Thu, 02 Sep 2010 13:53 +0100, "Jan Beulich" <JBeulich@xxxxxxxxxx> wrote:
> The scope should really extend to the end of the function, not the
> return location.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
> 
> ---
>  arch/x86/kernel/entry_64.S |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
> +++ 2.6.36-rc3-x86_64-error_entry-unwind-scope/arch/x86/kernel/entry_64.S
> @@ -1445,7 +1445,6 @@ error_swapgs:
>  error_sti:
>  	TRACE_IRQS_OFF
>  	ret
> -       CFI_ENDPROC
>  
>  /*
>   * There are two places in the kernel that can potentially fault with
> @@ -1470,6 +1469,7 @@ bstep_iret:
>  	/* Fix truncated RIP */
>  	movq %rcx,RIP+8(%rsp)
>  	jmp error_swapgs
> +       CFI_ENDPROC
>  END(error_entry)
>  

Indeed.

Acked-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/