aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-09-22 22:04:53 +0800
committerAlex Shi <alex.shi@linaro.org>2014-09-22 22:04:53 +0800
commit788c49fd7e9f91d2fd33e243a711ef4e9ad2d104 (patch)
tree5eec22910df8933e2e5e7436fb4019e66ec701bb
parente2ddb358af5685e7a1de5400c80e4897554880d2 (diff)
parentc5b2a660db70c8e591e8e2e3f7024073177b7124 (diff)
downloadlinux-linaro-stable-788c49fd7e9f91d2fd33e243a711ef4e9ad2d104.tar.gz
Merge remote-tracking branch 'origin/v3.10/topic/android-fixes' into linux-linaro-lsk-androidlsk-v3.10-android-14.09
-rw-r--r--arch/arm64/include/asm/ptrace.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index 59bd5ad7a02d..5db016e6d065 100644
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -135,6 +135,11 @@ struct pt_regs {
#define user_stack_pointer(regs) \
(!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp)
+static inline unsigned long regs_return_value(struct pt_regs *regs)
+{
+ return regs->regs[0];
+}
+
/*
* Are the current registers suitable for user mode? (used to maintain
* security in signal handlers)