diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /arch/powerpc/kernel/misc_32.S | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'arch/powerpc/kernel/misc_32.S')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 777d999f563b..2b0ad9845363 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
| @@ -36,26 +36,41 @@ | |||
| 36 | 36 | ||
| 37 | .text | 37 | .text |
| 38 | 38 | ||
| 39 | /* | ||
| 40 | * We store the saved ksp_limit in the unused part | ||
| 41 | * of the STACK_FRAME_OVERHEAD | ||
| 42 | */ | ||
| 39 | _GLOBAL(call_do_softirq) | 43 | _GLOBAL(call_do_softirq) |
| 40 | mflr r0 | 44 | mflr r0 |
| 41 | stw r0,4(r1) | 45 | stw r0,4(r1) |
| 46 | lwz r10,THREAD+KSP_LIMIT(r2) | ||
| 47 | addi r11,r3,THREAD_INFO_GAP | ||
| 42 | stwu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r3) | 48 | stwu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r3) |
| 43 | mr r1,r3 | 49 | mr r1,r3 |
| 50 | stw r10,8(r1) | ||
| 51 | stw r11,THREAD+KSP_LIMIT(r2) | ||
| 44 | bl __do_softirq | 52 | bl __do_softirq |
| 53 | lwz r10,8(r1) | ||
| 45 | lwz r1,0(r1) | 54 | lwz r1,0(r1) |
| 46 | lwz r0,4(r1) | 55 | lwz r0,4(r1) |
| 56 | stw r10,THREAD+KSP_LIMIT(r2) | ||
| 47 | mtlr r0 | 57 | mtlr r0 |
| 48 | blr | 58 | blr |
| 49 | 59 | ||
| 50 | _GLOBAL(call_handle_irq) | 60 | _GLOBAL(call_do_irq) |
| 51 | mflr r0 | 61 | mflr r0 |
| 52 | stw r0,4(r1) | 62 | stw r0,4(r1) |
| 53 | mtctr r6 | 63 | lwz r10,THREAD+KSP_LIMIT(r2) |
| 54 | stwu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r5) | 64 | addi r11,r3,THREAD_INFO_GAP |
| 55 | mr r1,r5 | 65 | stwu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r4) |
| 56 | bctrl | 66 | mr r1,r4 |
| 67 | stw r10,8(r1) | ||
| 68 | stw r11,THREAD+KSP_LIMIT(r2) | ||
| 69 | bl __do_irq | ||
| 70 | lwz r10,8(r1) | ||
| 57 | lwz r1,0(r1) | 71 | lwz r1,0(r1) |
| 58 | lwz r0,4(r1) | 72 | lwz r0,4(r1) |
| 73 | stw r10,THREAD+KSP_LIMIT(r2) | ||
| 59 | mtlr r0 | 74 | mtlr r0 |
| 60 | blr | 75 | blr |
| 61 | 76 | ||