Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 3fa26a61eabc..b390ff76e58f 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -677,8 +677,6 @@ static inline void sync_core(void)
          * Like all of Linux's memory ordering operations, this is a
          * compiler barrier as well.
          */
-        register void *__sp asm(_ASM_SP);
-
 #ifdef CONFIG_X86_32
         asm volatile (
                 "pushfl\n\t"
@@ -686,7 +684,7 @@ static inline void sync_core(void)
                 "pushl $1f\n\t"
                 "iret\n\t"
                 "1:"
-                : "+r" (__sp) : : "memory");
+                : ASM_CALL_CONSTRAINT : : "memory");
 #else
         unsigned int tmp;
 
@@ -703,7 +701,7 @@ static inline void sync_core(void)
                 "iretq\n\t"
                 UNWIND_HINT_RESTORE
                 "1:"
-                : "=&r" (tmp), "+r" (__sp) : : "cc", "memory");
+                : "=&r" (tmp), ASM_CALL_CONSTRAINT : : "cc", "memory");
 #endif
 }