From cafb0ddac60556f7d2d4cd0ef1a93da8a6c71ffb Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Sun, 2 Aug 2009 22:40:11 +0100 Subject: [PATCH] sh: Add CFI annotations for exception return. Annotate various assembly code paths with CFI assembler directives so that DWARF unwind info is available for the unwinder. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt --- arch/sh/kernel/entry-common.S | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index b3b215fb21f7..e63178fefb9b 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -43,6 +43,7 @@ * syscall # * */ +#include #if defined(CONFIG_PREEMPT) # define preempt_stop() cli ; TRACE_IRQS_OFF @@ -66,6 +67,11 @@ ENTRY(exception_error) .align 2 ret_from_exception: + CFI_STARTPROC simple + CFI_DEF_CFA r14, 0 + CFI_REL_OFFSET 17, 64 + CFI_REL_OFFSET 15, 0 + CFI_REL_OFFSET 14, 56 preempt_stop() ENTRY(ret_from_irq) ! @@ -240,6 +246,7 @@ debug_trap: nop bra __restore_all nop + CFI_ENDPROC .align 2 1: .long debug_trap_table -- 2.11.0