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/kernel | |
| 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/kernel')
| -rw-r--r-- | arch/arc/kernel/asm-offsets.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arc/kernel/asm-offsets.c b/arch/arc/kernel/asm-offsets.c index 1f621e416521..c783bcd35eb8 100644 --- a/arch/arc/kernel/asm-offsets.c +++ b/arch/arc/kernel/asm-offsets.c @@ -66,7 +66,15 @@ int main(void) DEFINE(SZ_CALLEE_REGS, sizeof(struct callee_regs)); DEFINE(SZ_PT_REGS, sizeof(struct pt_regs)); - DEFINE(PT_user_r25, offsetof(struct pt_regs, user_r25)); + +#ifdef CONFIG_ISA_ARCV2 + OFFSET(PT_r12, pt_regs, r12); + OFFSET(PT_r30, pt_regs, r30); +#endif +#ifdef CONFIG_ARC_HAS_ACCL_REGS + OFFSET(PT_r58, pt_regs, r58); + OFFSET(PT_r59, pt_regs, r59); +#endif return 0; } |