diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-06 19:16:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-06 19:16:48 +0100 |
| commit | 8f8b69aa501e84a0043428467a5a22b55e937cbd (patch) | |
| tree | ef2b60e9f44a546cfdc6b621dd34d989d4de680d /arch/arc/include/asm/entry-arcv2.h | |
| parent | arm64: Revert support for execute-only user mappings (diff) | |
| parent | ARC: pt_regs: remove hardcoded registers offset (diff) | |
| download | linux-8f8b69aa501e84a0043428467a5a22b55e937cbd.tar.xz linux-8f8b69aa501e84a0043428467a5a22b55e937cbd.zip | |
Merge tag 'arc-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
"Kconfig warning, stale define, duplicate asm-offset entry ..."
* tag 'arc-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: pt_regs: remove hardcoded registers offset
ARC: asm-offsets: remove duplicate entry
ARC: mm: drop stale define of __ARCH_USE_5LEVEL_HACK
arc: eznps: fix allmodconfig kconfig warning
Diffstat (limited to 'arch/arc/include/asm/entry-arcv2.h')
| -rw-r--r-- | arch/arc/include/asm/entry-arcv2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arc/include/asm/entry-arcv2.h b/arch/arc/include/asm/entry-arcv2.h index 41b16f21beec..0b8b63d0bec1 100644 --- a/arch/arc/include/asm/entry-arcv2.h +++ b/arch/arc/include/asm/entry-arcv2.h @@ -162,7 +162,7 @@ #endif #ifdef CONFIG_ARC_HAS_ACCL_REGS - ST2 r58, r59, PT_sp + 12 + ST2 r58, r59, PT_r58 #endif .endm @@ -172,8 +172,8 @@ LD2 gp, fp, PT_r26 ; gp (r26), fp (r27) - ld r12, [sp, PT_sp + 4] - ld r30, [sp, PT_sp + 8] + ld r12, [sp, PT_r12] + ld r30, [sp, PT_r30] ; Restore SP (into AUX_USER_SP) only if returning to U mode ; - for K mode, it will be implicitly restored as stack is unwound @@ -190,7 +190,7 @@ #endif #ifdef CONFIG_ARC_HAS_ACCL_REGS - LD2 r58, r59, PT_sp + 12 + LD2 r58, r59, PT_r58 #endif .endm |