patches: linux-next: x86_64: Refresh after new uaccess.h conflict

Due to https://git.kernel.org/tip/6ae865615fc43d014da2fd1f1bba7e81ee622d1b

[skip ci]

Signed-off-by: Nathan Chancellor <[email protected]>

Author: nathanchance

patches/linux-next/x86_64/x86-series.patch

@@ -1,4 +1,4 @@
-From aef1d9a42c562406030cb0f4ba9fab7e9b7d5145 Mon Sep 17 00:00:00 2001
+From 3b5f7c47389865240a781933324d165897e00abc Mon Sep 17 00:00:00 2001
 From: Nathan Chancellor <[email protected]>
 Date: Sat, 5 Jan 2019 11:51:39 -0700
 Subject: [PATCH 1/2] DO-NOT-UPSTREAM: x86: Revert two commits that break the
@@ -11,7 +11,9 @@ We've been fortunate enough to get around the asm goto requirement
 introduced in commit e501ce957a78 ("x86: Force asm-goto") until now.
 
 This is not a clean revert because of commit 2a418cf3f5f1 ("x86/uaccess:
-Don't leak the AC flag into __put_user() value evaluation").
+Don't leak the AC flag into __put_user() value evaluation") and commit
+6ae865615fc4 ("x86/uaccess: Dont leak the AC flag into __put_user()
+argument evaluation").
 
 Link: https://github.com/ClangBuiltLinux/linux/issues/6
 Signed-off-by: Nathan Chancellor <[email protected]>
@@ -20,7 +22,7 @@ Signed-off-by: Nathan Chancellor <[email protected]>
  1 file changed, 41 insertions(+), 39 deletions(-)
 
 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
-index 22ba683afdc2..9352dbef0fdd 100644
+index c82abd6e4ca3..5abc7e144e01 100644
 --- a/arch/x86/include/asm/uaccess.h
 +++ b/arch/x86/include/asm/uaccess.h
 @@ -182,14 +182,19 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
@@ -90,24 +92,25 @@ index 22ba683afdc2..9352dbef0fdd 100644
  		break;							\
  	default:							\
  		__put_user_bad();					\
-@@ -425,14 +431,11 @@ do {									\
+@@ -425,15 +431,12 @@ do {									\
 
  #define __put_user_nocheck(x, ptr, size)			\
  ({								\
 -	__label__ __pu_label;					\
 -	int __pu_err = -EFAULT;					\
 +	int __pu_err;						\
- 	__typeof__(*(ptr)) __pu_val;				\
- 	__pu_val = x;						\
+ 	__typeof__(*(ptr)) __pu_val = (x);			\
+ 	__typeof__(ptr) __pu_ptr = (ptr);			\
+ 	__typeof__(size) __pu_size = (size);			\
  	__uaccess_begin();					\
--	__put_user_size(__pu_val, (ptr), (size), __pu_label);	\
+-	__put_user_size(__pu_val, __pu_ptr, __pu_size, __pu_label);	\
 -	__pu_err = 0;						\
 -__pu_label:							\
-+	__put_user_size(__pu_val, (ptr), (size), __pu_err, -EFAULT);\
++	__put_user_size(__pu_val, __pu_ptr, __pu_size, __pu_err, -EFAULT);\
  	__uaccess_end();					\
  	__builtin_expect(__pu_err, 0);				\
  })
-@@ -457,23 +460,17 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -458,23 +461,17 @@ struct __large_struct { unsigned long buf[100]; };
   * we do not write to any memory gcc knows about, so there are no
   * aliasing issues.
   */
@@ -142,7 +145,7 @@ index 22ba683afdc2..9352dbef0fdd 100644
 
  #define __put_user_asm_ex(x, addr, itype, rtype, ltype)			\
  	asm volatile("1:	mov"itype" %"rtype"0,%1\n"		\
-@@ -717,8 +714,13 @@ static __must_check __always_inline bool user_access_begin(const void __user *pt
+@@ -718,8 +715,13 @@ static __must_check __always_inline bool user_access_begin(const void __user *pt
  #define user_access_save()	smap_save()
  #define user_access_restore(x)	smap_restore(x)
 
@@ -162,7 +165,7 @@ index 22ba683afdc2..9352dbef0fdd 100644
 2.21.0
 
 
-From fdd79fe62ad7170ba301686ff66750959d6d53f1 Mon Sep 17 00:00:00 2001
+From f272bf78754e6250c2ea118520686c5b873a114c Mon Sep 17 00:00:00 2001
 From: Nathan Chancellor <[email protected]>
 Date: Tue, 25 Sep 2018 13:32:33 -0700
 Subject: [PATCH 2/2] DO-NOT-UPSTREAM: x86: Avoid warnings/errors due to lack