arch/x86: replace "__auto_type" with "auto"

Replace instances of "__auto_type" with "auto" in:

	arch/x86/include/asm/bug.h
	arch/x86/include/asm/string_64.h
	arch/x86/include/asm/uaccess_64.h

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h
index ee23b98353d735fd09a161ee217719d357b2c4af..d561a8443c137151e09b5eab9830968695e9e39b 100644 (file)
--- a/arch/x86/include/asm/bug.h
+++ b/arch/x86/include/asm/bug.h
@@ -129,7 +129,7 @@ do {                                                                \
 
 #define __WARN_FLAGS(cond_str, flags)                                  \
 do {                                                                   \
-       __auto_type __flags = BUGFLAG_WARNING|(flags);                  \
+       auto __flags = BUGFLAG_WARNING|(flags);                         \
        instrumentation_begin();                                        \
        _BUG_FLAGS(cond_str, ASM_UD2, __flags, ARCH_WARN_REACHABLE);    \
        instrumentation_end();                                          \

diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h
index 79e9695dc13e41d889b5479f2d597a27635b6b70..4635616863f53d0e1be1cd596b7141ee63bfdf44 100644 (file)
--- a/arch/x86/include/asm/string_64.h
+++ b/arch/x86/include/asm/string_64.h
@@ -31,7 +31,7 @@ KCFI_REFERENCE(__memset);
 #define __HAVE_ARCH_MEMSET16
 static inline void *memset16(uint16_t *s, uint16_t v, size_t n)
 {
-       const __auto_type s0 = s;
+       const auto s0 = s;
        asm volatile (
                "rep stosw"
                : "+D" (s), "+c" (n)
@@ -44,7 +44,7 @@ static inline void *memset16(uint16_t *s, uint16_t v, size_t n)
 #define __HAVE_ARCH_MEMSET32
 static inline void *memset32(uint32_t *s, uint32_t v, size_t n)
 {
-       const __auto_type s0 = s;
+       const auto s0 = s;
        asm volatile (
                "rep stosl"
                : "+D" (s), "+c" (n)
@@ -57,7 +57,7 @@ static inline void *memset32(uint32_t *s, uint32_t v, size_t n)
 #define __HAVE_ARCH_MEMSET64
 static inline void *memset64(uint64_t *s, uint64_t v, size_t n)
 {
-       const __auto_type s0 = s;
+       const auto s0 = s;
        asm volatile (
                "rep stosq"
                : "+D" (s), "+c" (n)

diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index 641f45c22f9dab4e28f9aa4f03a7d00506811708..915124011c27648bcb71bb0637cb7f07075abef0 100644 (file)
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -72,7 +72,7 @@ static inline void __user *mask_user_address(const void __user *ptr)
        return ret;
 }
 #define masked_user_access_begin(x) ({                         \
-       __auto_type __masked_ptr = (x);                         \
+       auto __masked_ptr = (x);                                \
        __masked_ptr = mask_user_address(__masked_ptr);         \
        __uaccess_begin(); __masked_ptr; })