Skip to content

Commit 2a5b286

Browse files
author
H. Peter Anvin
committed
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>
1 parent add9b1b commit 2a5b286

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/x86/include/asm/bug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ do { \
129129

130130
#define __WARN_FLAGS(cond_str, flags) \
131131
do { \
132-
__auto_type __flags = BUGFLAG_WARNING|(flags); \
132+
auto __flags = BUGFLAG_WARNING|(flags); \
133133
instrumentation_begin(); \
134134
_BUG_FLAGS(cond_str, ASM_UD2, __flags, ARCH_WARN_REACHABLE); \
135135
instrumentation_end(); \

arch/x86/include/asm/string_64.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ KCFI_REFERENCE(__memset);
3131
#define __HAVE_ARCH_MEMSET16
3232
static inline void *memset16(uint16_t *s, uint16_t v, size_t n)
3333
{
34-
const __auto_type s0 = s;
34+
const auto s0 = s;
3535
asm volatile (
3636
"rep stosw"
3737
: "+D" (s), "+c" (n)
@@ -44,7 +44,7 @@ static inline void *memset16(uint16_t *s, uint16_t v, size_t n)
4444
#define __HAVE_ARCH_MEMSET32
4545
static inline void *memset32(uint32_t *s, uint32_t v, size_t n)
4646
{
47-
const __auto_type s0 = s;
47+
const auto s0 = s;
4848
asm volatile (
4949
"rep stosl"
5050
: "+D" (s), "+c" (n)
@@ -57,7 +57,7 @@ static inline void *memset32(uint32_t *s, uint32_t v, size_t n)
5757
#define __HAVE_ARCH_MEMSET64
5858
static inline void *memset64(uint64_t *s, uint64_t v, size_t n)
5959
{
60-
const __auto_type s0 = s;
60+
const auto s0 = s;
6161
asm volatile (
6262
"rep stosq"
6363
: "+D" (s), "+c" (n)

arch/x86/include/asm/uaccess_64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static inline void __user *mask_user_address(const void __user *ptr)
7272
return ret;
7373
}
7474
#define masked_user_access_begin(x) ({ \
75-
__auto_type __masked_ptr = (x); \
75+
auto __masked_ptr = (x); \
7676
__masked_ptr = mask_user_address(__masked_ptr); \
7777
__uaccess_begin(); __masked_ptr; })
7878

0 commit comments

Comments
 (0)