From: Mark Brown <broonie@kernel.org>
Date: Fri, 23 Jan 2015 01:31:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~32^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e0d6b762315b382e8c0aa07631491f47de4cb72b;p=firefly-linux-kernel-4.4.55.git

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

e0d6b762315b382e8c0aa07631491f47de4cb72b
diff --cc arch/arm64/include/asm/ptrace.h
index a429b5940be2,47d0ab177f7e..5db016e6d065
--- a/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)