diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 13:00:02 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 13:00:02 +0900 |
| commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
| tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/sh/kernel/entry-common.S | |
| parent | df47cd096c8f54a5242e3a2ffb4525c804567eda (diff) | |
| parent | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (diff) | |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index fc26ccd8278..e63178fefb9 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -43,6 +43,7 @@ * syscall # * */ +#include <asm/dwarf.h> #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 @@ -285,6 +292,7 @@ ret_from_fork: * system calls and debug traps through their respective jump tables. */ ENTRY(system_call) + setup_frame_reg #if !defined(CONFIG_CPU_SH2) mov.l 1f, r9 mov.l @r9, r8 ! Read from TRA (Trap Address) Register |