diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-22 17:53:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-22 17:53:02 -0500 |
| commit | ef0e1ea8856bed6ff8394d3dfe77f2cab487ecea (patch) | |
| tree | 0656919ad706e48bf4611c543491913ef0fa920d /arch/arc/include/asm/entry.h | |
| parent | 37c669b237499cc4b8279466a83bcafed1ca2829 (diff) | |
| parent | c57653dc94d0db7bf63067433ceaa97bdcd0a312 (diff) | |
| download | linux-next-ef0e1ea8856bed6ff8394d3dfe77f2cab487ecea.tar.gz linux-next-ef0e1ea8856bed6ff8394d3dfe77f2cab487ecea.zip | |
Merge tag 'arc-4.8-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- support for Syscall ABI v4 with upstream gcc 6.x
- lockdep fix (Daniel Mentz)
- gdb register clobber (Liav Rehana)
- couple of missing exports for modules
- other fixes here and there
* tag 'arc-4.8-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: export __udivdi3 for modules
ARC: mm: fix build breakage with STRICT_MM_TYPECHECKS
ARC: export kmap
ARC: Support syscall ABI v4
ARC: use correct offset in pt_regs for saving/restoring user mode r25
ARC: Elide redundant setup of DMA callbacks
ARC: Call trace_hardirqs_on() before enabling irqs
Diffstat (limited to 'arch/arc/include/asm/entry.h')
| -rw-r--r-- | arch/arc/include/asm/entry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h index ad7860c5ce15..51597f344a62 100644 --- a/arch/arc/include/asm/entry.h +++ b/arch/arc/include/asm/entry.h @@ -142,7 +142,7 @@ #ifdef CONFIG_ARC_CURR_IN_REG ; Retrieve orig r25 and save it with rest of callee_regs - ld.as r12, [r12, PT_user_r25] + ld r12, [r12, PT_user_r25] PUSH r12 #else PUSH r25 @@ -198,7 +198,7 @@ ; SP is back to start of pt_regs #ifdef CONFIG_ARC_CURR_IN_REG - st.as r12, [sp, PT_user_r25] + st r12, [sp, PT_user_r25] #endif .endm |