The following commit has been merged into the x86/asm branch of tip:

Commit-ID:     4719ffecbb0659faf1fd39f4b8eb2674f0042890
Gitweb:        
https://git.kernel.org/tip/4719ffecbb0659faf1fd39f4b8eb2674f0042890
Author:        Brian Gerst <brge...@gmail.com>
AuthorDate:    Mon, 20 Jul 2020 13:49:24 -07:00
Committer:     Thomas Gleixner <t...@linutronix.de>
CommitterDate: Thu, 23 Jul 2020 11:46:43 +02:00

x86/percpu: Remove unused PER_CPU() macro

Also remove now unused __percpu_mov_op.

Signed-off-by: Brian Gerst <brge...@gmail.com>
Signed-off-by: Nick Desaulniers <ndesaulni...@google.com>
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Tested-by: Nick Desaulniers <ndesaulni...@google.com>
Tested-by: Sedat Dilek <sedat.di...@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulni...@google.com>
Acked-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Acked-by: Linus Torvalds <torva...@linux-foundation.org>
Acked-by: Dennis Zhou <den...@kernel.org>
Link: 
https://lkml.kernel.org/r/20200720204925.3654302-11-ndesaulni...@google.com

---
 arch/x86/include/asm/percpu.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index cf2b9c2..a3c33b7 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -4,33 +4,15 @@
 
 #ifdef CONFIG_X86_64
 #define __percpu_seg           gs
-#define __percpu_mov_op                movq
 #else
 #define __percpu_seg           fs
-#define __percpu_mov_op                movl
 #endif
 
 #ifdef __ASSEMBLY__
 
-/*
- * PER_CPU finds an address of a per-cpu variable.
- *
- * Args:
- *    var - variable name
- *    reg - 32bit register
- *
- * The resulting address is stored in the "reg" argument.
- *
- * Example:
- *    PER_CPU(cpu_gdt_descr, %ebx)
- */
 #ifdef CONFIG_SMP
-#define PER_CPU(var, reg)                                              \
-       __percpu_mov_op %__percpu_seg:this_cpu_off, reg;                \
-       lea var(reg), reg
 #define PER_CPU_VAR(var)       %__percpu_seg:var
 #else /* ! SMP */
-#define PER_CPU(var, reg)      __percpu_mov_op $var, reg
 #define PER_CPU_VAR(var)       var
 #endif /* SMP */
 

Reply via email to