diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-04-11 17:15:35 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-04-11 17:15:35 +0200 |
commit | 2b899390fdc8b8bdb95ce24269a799194b303388 (patch) | |
tree | ee02a7ae5b0f94029c5594573ae4aa97944a2c0c /arch/parisc/include/asm/ptrace.h | |
parent | 5aba6c47401d14247a44c3ae94d1bdab5653f692 (diff) | |
parent | 26b25a2b98e45aeb40eedcedc586ad5034cbd984 (diff) | |
download | linux-stable-2b899390fdc8b8bdb95ce24269a799194b303388.tar.gz linux-stable-2b899390fdc8b8bdb95ce24269a799194b303388.tar.bz2 linux-stable-2b899390fdc8b8bdb95ce24269a799194b303388.zip |
Merge branch 'api-features' into x86/vt-d
Diffstat (limited to 'arch/parisc/include/asm/ptrace.h')
-rw-r--r-- | arch/parisc/include/asm/ptrace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h index 2a27b275ab09..9ff033d261ab 100644 --- a/arch/parisc/include/asm/ptrace.h +++ b/arch/parisc/include/asm/ptrace.h @@ -22,13 +22,14 @@ unsigned long profile_pc(struct pt_regs *); static inline unsigned long regs_return_value(struct pt_regs *regs) { - return regs->gr[20]; + return regs->gr[28]; } static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) { - regs->iaoq[0] = val; + regs->iaoq[0] = val; + regs->iaoq[1] = val + 4; } /* Query offset/name of register from its name/offset */ |