diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-01-09 12:10:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-09 12:13:43 -0800 |
| commit | a2d6d7ae591c47ebc04926cb29a840adfdde49e6 (patch) | |
| tree | be464f987f0ab690481e2783d680aa88574026e4 /arch/arc/kernel/asm-offsets.c | |
| parent | Merge branch 'sfc-more-code-refactoring' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (diff) | |
| download | linux-dev-a2d6d7ae591c47ebc04926cb29a840adfdde49e6.tar.xz linux-dev-a2d6d7ae591c47ebc04926cb29a840adfdde49e6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure. The resolution used here is
from Petr Machata.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arc/kernel/asm-offsets.c')
| -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; } |