diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-26 10:59:49 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-26 10:59:49 +0100 |
| commit | c92a90a5060a84e4a180af6b60aa0fb3a5e46c64 (patch) | |
| tree | 80a6446dbc8da07ce2bf168794d9ac8344a0d90e /arch/arm/mm/proc-v7m.S | |
| parent | 6d80594936914e798b1b54b3bfe4bd68d8418966 (diff) | |
| parent | 11ce4b33aedc65198d7bc9669344ebca5ee36a41 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/mm/proc-v7m.S')
| -rw-r--r-- | arch/arm/mm/proc-v7m.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S index 50497778c2e5..47a5acc64433 100644 --- a/arch/arm/mm/proc-v7m.S +++ b/arch/arm/mm/proc-v7m.S @@ -135,9 +135,11 @@ __v7m_setup_cont: dsb mov r6, lr @ save LR ldr sp, =init_thread_union + THREAD_START_SP + stmia sp, {r0-r3, r12} cpsie i svc #0 1: cpsid i + ldmia sp, {r0-r3, r12} str r5, [r12, #11 * 4] @ restore the original SVC vector entry mov lr, r6 @ restore LR |