The following commit has been merged into the x86/asm branch of tip: Commit-ID: e4d16defbbde028aeab2026995f0ced4240df6d6 Gitweb: https://git.kernel.org/tip/e4d16defbbde028aeab2026995f0ced4240df6d6 Author: Brian Gerst <brgerst@xxxxxxxxx> AuthorDate: Mon, 20 Jul 2020 13:49:19 -07:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Thu, 23 Jul 2020 11:46:40 +02:00 x86/percpu: Remove "e" constraint from XADD The "e" constraint represents a constant, but the XADD instruction doesn't accept immediate operands. Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx> Signed-off-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Tested-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx> Reviewed-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Acked-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Acked-by: Dennis Zhou <dennis@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200720204925.3654302-6-ndesaulniers@xxxxxxxxxx --- arch/x86/include/asm/percpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 2a24f3c..9bb5440 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -220,7 +220,7 @@ do { \ break; \ case 8: \ asm qual ("xaddq %0, "__percpu_arg(1) \ - : "+re" (paro_ret__), "+m" (var) \ + : "+r" (paro_ret__), "+m" (var) \ : : "memory"); \ break; \ default: __bad_percpu_size(); \