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

diff --cc arch/arm64/include/asm/ptrace.h
index 59bd5ad7a02dd28785f7cdeb683c197fb8c5ebc6,f38a8aa58d4c729f68c7b3437d7310011cfc96f7..5db016e6d06539c76d523401cc83c1b9a1f29d90
--- 1/arch/arm64/include/asm/ptrace.h
--- 2/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)