Messages in this thread Patch in this message | | | Date | Fri, 03 Sep 2010 07:36:43 +0100 | From | "Jan Beulich" <> | Subject | [PATCH] x86-64: fix CFI coverage for error_entry() |
| |
The scope should really extend to the end of the function, not the return location.
(Subject was wrong in the variant I sent yesterday.)
Signed-off-by: Jan Beulich <jbeulich@novell.com> Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
--- 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)
| |