Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk

diff --cc arch/arm64/include/asm/ptrace.h
index a429b5940be2e614a8149fcc7c7acac9d2b4fad0,47d0ab177f7ea8e2066a92fa15e34b69e9dae5a1..5db016e6d06539c76d523401cc83c1b9a1f29d90
--- 1/arch/arm64/include/asm/ptrace.h
--- 2/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@@ -133,13 -132,8 +133,13 @@@ 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)
 +{
 +      return regs->regs[0];
 +}
 +
  /*
   * Are the current registers suitable for user mode? (used to maintain
   * security in signal handlers)