Commit 15beb1b7 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andrew Morton
Browse files

x86/asm: replace custom COUNT_ARGS() & CONCATENATE() implementations 

Replace custom implementation of the macros from args.h.

Link: https://lkml.kernel.org/r/20230718211147.18647-3-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Brendan Higgins <brendan.higgins@linux.dev>
Cc: Daniel Latypov <dlatypov@google.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Gow <davidgow@google.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b229baa3

arch/x86/include/asm/rmwcc.h

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