x86-asm-replace-custom-count_args-concatenate-implementations.patch removed from -mm tree
The quilt patch titled
Subject: x86/asm: replace custom COUNT_ARGS() & CONCATENATE() implementations
has been removed from the -mm tree. Its filename was
x86-asm-replace-custom-count_args-concatenate-implementations.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andy Shevchenko <[email protected]>
Subject: x86/asm: replace custom COUNT_ARGS() & CONCATENATE() implementations
Date: Wed, 19 Jul 2023 00:11:45 +0300
Replace custom implementation of the macros from args.h.
Signed-off-by Andy Shevchenko <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Borislav Petkov (AMD) <[email protected]>
Cc Brendan Higgins <[email protected]>
Cc Daniel Latypov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Gow <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Masami Hiramatsu (Google) <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Steven Rostedt (Google) <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/x86/include/asm/rmwcc.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
arch/x86/include/asm/rmwcc.h renamed from arch/x86/include/asm/rmwcc.h~x86-asm-replace-custom-count_args-concatenate-implementations +3 -8
@@ -2,12 +2,7 @@#ifndef _ASM_X86_RMWcc#define _ASM_X86_RMWcc -/* This counts to 12. Any more, it will return 13th argument. */ -#define __RMWcc_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n -#define RMWcc_ARGS(X...) __RMWcc_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) - -#define __RMWcc_CONCAT (a, b) a ## b -#define RMWcc_CONCAT (a, b) __RMWcc_CONCAT(a, b) +#include <linux/args.h> #define __CLOBBERS_MEM(clb...) "memory", ## clb
@@ -48,7 +43,7 @@ cc_label: c = true; \#define GEN_UNARY_RMWcc_3 (op, var, cc) \ GEN_UNARY_RMWcc_4(op, var, cc, "%[var]") -#define GEN_UNARY_RMWcc(X...) RMWcc_CONCAT(GEN_UNARY_RMWcc_, RMWcc_ARGS(X))(X) +#define GEN_UNARY_RMWcc(X...) CONCATENATE(GEN_UNARY_RMWcc_, COUNT_ARGS(X))(X)#define GEN_BINARY_RMWcc_6 (op, var, cc, vcon, _val, arg0) \ __GEN_RMWcc(op " %[val], " arg0, var, cc, \
@@ -57,7 +52,7 @@ cc_label: c = true; \#define GEN_BINARY_RMWcc_5 (op, var, cc, vcon, val) \ GEN_BINARY_RMWcc_6(op, var, cc, vcon, val, "%[var]") -#define GEN_BINARY_RMWcc(X...) RMWcc_CONCAT(GEN_BINARY_RMWcc_, RMWcc_ARGS(X))(X) +#define GEN_BINARY_RMWcc(X...) CONCATENATE(GEN_BINARY_RMWcc_, COUNT_ARGS(X))(X) #define GEN_UNARY_SUFFIXED_RMWcc(op, suffix, var, cc, clobbers...) \ __GEN_RMWcc(op " %[var]\n\t" suffix, var, cc, \
_
Patches currently in -mm which might be from [email protected] are