Commit 2a5b286b authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
parent add9b1be

arch/x86/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -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();						\

arch/x86/include/asm/string_64.h

+3 −3
Original line number Diff line number Diff line
@@ -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)

arch/x86/include/asm/uaccess_64.h

+1 −1
Original line number Diff line number Diff line
@@ -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; })