diff options
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
-rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 159d0416f270..b55cb0331809 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include <asm/ftrace.h> | 12 | #include <asm/ftrace.h> |
13 | #include <mach/entry-macro.S> | 13 | #include <mach/entry-macro.S> |
14 | #include <asm/unwind.h> | ||
14 | 15 | ||
15 | #include "entry-header.S" | 16 | #include "entry-header.S" |
16 | 17 | ||
@@ -22,6 +23,8 @@ | |||
22 | * stack. | 23 | * stack. |
23 | */ | 24 | */ |
24 | ret_fast_syscall: | 25 | ret_fast_syscall: |
26 | UNWIND(.fnstart ) | ||
27 | UNWIND(.cantunwind ) | ||
25 | disable_irq @ disable interrupts | 28 | disable_irq @ disable interrupts |
26 | ldr r1, [tsk, #TI_FLAGS] | 29 | ldr r1, [tsk, #TI_FLAGS] |
27 | tst r1, #_TIF_WORK_MASK | 30 | tst r1, #_TIF_WORK_MASK |
@@ -38,6 +41,7 @@ ret_fast_syscall: | |||
38 | mov r0, r0 | 41 | mov r0, r0 |
39 | add sp, sp, #S_FRAME_SIZE - S_PC | 42 | add sp, sp, #S_FRAME_SIZE - S_PC |
40 | movs pc, lr @ return & move spsr_svc into cpsr | 43 | movs pc, lr @ return & move spsr_svc into cpsr |
44 | UNWIND(.fnend ) | ||
41 | 45 | ||
42 | /* | 46 | /* |
43 | * Ok, we need to do extra processing, enter the slow path. | 47 | * Ok, we need to do extra processing, enter the slow path. |