Messages in this thread Patch in this message | | | Date | Wed, 30 Jun 2010 14:28:08 +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.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- 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)
| |