diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-23 01:31:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 01:31:57 +0000 |
| commit | e0d6b762315b382e8c0aa07631491f47de4cb72b (patch) | |
| tree | 3ef5ed7deb1ed4caa4829f9233e1c5e5831a03be /arch/arm64/include/asm/ptrace.h | |
| parent | 6d4a4b3a1b64adb217706c9b52e87972d305de08 (diff) | |
| parent | 598e8b9c75705238d4e0c7ff8532ca4acfefdcde (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk
Diffstat (limited to 'arch/arm64/include/asm/ptrace.h')
| -rw-r--r-- | arch/arm64/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index a429b5940be2..5db016e6d065 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -133,7 +133,7 @@ struct pt_regs { (!((regs)->pstate & PSR_F_BIT)) #define user_stack_pointer(regs) \ - (!compat_user_mode(regs)) ? ((regs)->sp) : ((regs)->compat_sp) + (!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp) static inline unsigned long regs_return_value(struct pt_regs *regs) { |