Merge branch 'devel-stable' into for-next

2017-11-08 19:42:47 +00:00
parent 7f3d1f9843 fe9c0589ee
commit 02196144a0
33 changed files with 1137 additions and 455 deletions
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -655,6 +655,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
 		set_tls(regs->ARM_r0);
 		return 0;

+	case NR(get_tls):
+		return current_thread_info()->tp_value[0];
+
 	default:
 		/* Calls 9f00xx..9f07ff are defined to return -ENOSYS
 		   if not implemented, rather than raising SIGILL.  This