From: Alex Shi <alex.shi@linaro.org>
Date: Mon, 22 Sep 2014 14:04:53 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/v3.10/topic/android-fixes' into linux-linaro... 
X-Git-Tag: firefly_0821_release~3680^2~64
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=788c49fd7e9f91d2fd33e243a711ef4e9ad2d104;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/v3.10/topic/android-fixes' into linux-linaro-lsk-android
---

788c49fd7e9f91d2fd33e243a711ef4e9ad2d104
diff --cc arch/arm64/include/asm/ptrace.h
index 59bd5ad7a02d,f38a8aa58d4c..5db016e6d065
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@@ -133,8 -131,13 +133,13 @@@ struct pt_regs 
  	(!((regs)->pstate & PSR_F_BIT))
  
  #define user_stack_pointer(regs) \
 -	((regs)->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)