From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:40:50 +0000 (+0100)
Subject: Merge tag 'v3.10.71' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d8d08710cbc9121d40167f37db6aa0385e59d62;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.71' into update

This is the 3.10.71 stable release
---

5d8d08710cbc9121d40167f37db6aa0385e59d62
diff --cc arch/arm64/kernel/signal32.c
index e1b8b9fb274e,3d478102b1c0..36db9874c0b7
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@@ -209,16 -208,8 +208,16 @@@ int copy_siginfo_to_user32(compat_sigin
  	case __SI_MESGQ: /* But this is */
  		err |= __put_user(from->si_pid, &to->si_pid);
  		err |= __put_user(from->si_uid, &to->si_uid);
- 		err |= __put_user((compat_uptr_t)(unsigned long)from->si_ptr, &to->si_ptr);
+ 		err |= __put_user(from->si_int, &to->si_int);
  		break;
 +#ifdef __ARCH_SIGSYS
 +	case __SI_SYS:
 +		err |= __put_user((compat_uptr_t)(unsigned long)
 +				from->si_call_addr, &to->si_call_addr);
 +		err |= __put_user(from->si_syscall, &to->si_syscall);
 +		err |= __put_user(from->si_arch, &to->si_arch);
 +		break;
 +#endif
  	default: /* this is just in case for now ... */
  		err |= __put_user(from->si_pid, &to->si_pid);
  		err |= __put_user(from->si_uid, &to->si_uid);