summaryrefslogtreecommitdiff
path: root/arch/x86/machine/cpu.h
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2018-04-14 22:03:50 +0200
committerRichard Braun <rbraun@sceen.net>2018-04-14 22:08:47 +0200
commitd4a39d61e853f570ec8d599e9500a80b035fb61f (patch)
tree5a5d7720c9e4d93a5f63beec9d7a0cedd1dcd62d /arch/x86/machine/cpu.h
parent4033816a7ce4a24230f462b5c22183c1b45e24df (diff)
Rename variables in function-like macros
Diffstat (limited to 'arch/x86/machine/cpu.h')
-rw-r--r--arch/x86/machine/cpu.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h
index 0023349..8f9b23c 100644
--- a/arch/x86/machine/cpu.h
+++ b/arch/x86/machine/cpu.h
@@ -435,13 +435,13 @@ extern void *cpu_local_area;
#define cpu_local_ptr(var) \
MACRO_BEGIN \
- typeof(var) *ptr___ = &(var); \
+ typeof(var) *ptr_ = &(var); \
\
asm("add %%fs:%1, %0" \
- : "+r" (ptr___) \
+ : "+r" (ptr_) \
: "m" (cpu_local_area)); \
\
- ptr___; \
+ ptr_; \
MACRO_END
#define cpu_local_var(var) (*cpu_local_ptr(var))
@@ -454,13 +454,13 @@ MACRO_END
#define cpu_local_read(var) \
MACRO_BEGIN \
- typeof(var) val___; \
+ typeof(var) val_; \
\
asm("mov %%fs:%1, %0" \
- : "=r" (val___) \
+ : "=r" (val_) \
: "m" (var)); \
\
- val___; \
+ val_; \
MACRO_END
static inline struct cpu *