[OS-BUILD PATCH 9/18] kabi: make RH_KABI_USE replace any number of reserved fields

[Prarit Bhargava (via Email Bridge)]

From: Čestmír Kalina <ckalina(a)redhat.com&gt;

kabi: make RH_KABI_USE replace any number of reserved fields

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2024595
Upstream Status: RHEL only

commit df9c99ec7a23f3333b36870549987f826b12a01f
Author: Jiri Benc <jbenc(a)redhat.com&gt;
Date: Wed, 1 Apr 2020 13:04:07 -0400

    Example usage:

    struct foo {
            int a;
            RH_KABI_USE(1, int b)
            RH_KABI_USE(2, 3, int c[3])
            RH_KABI_USE(4, 5, 6, 7, 8, 9, 10, long d[7])
            RH_KABI_RESERVE(11)
    };

    Documentation will be updated in a later patch.

    RH-Signed-off-by: Jiri Benc <jbenc(a)redhat.com&gt;

Signed-off-by: Čestmír Kalina <ckalina(a)redhat.com&gt;
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
index blahblah..blahblah 100644
--- a/include/linux/rh_kabi.h
+++ b/include/linux/rh_kabi.h
@@ -281,7 +281,22 @@
 /*
  * Simple wrappers to replace standard Red Hat reserved elements.
  */
-# define RH_KABI_USE(n, _new)		RH_KABI_REPLACE(_RH_KABI_RESERVE(n), _new)
+#define _RH_KABI_USE1(n, _new)	_RH_KABI_RESERVE(n), _new
+#define _RH_KABI_USE2(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE1(__VA_ARGS__)
+#define _RH_KABI_USE3(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE2(__VA_ARGS__)
+#define _RH_KABI_USE4(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE3(__VA_ARGS__)
+#define _RH_KABI_USE5(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE4(__VA_ARGS__)
+#define _RH_KABI_USE6(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE5(__VA_ARGS__)
+#define _RH_KABI_USE7(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE6(__VA_ARGS__)
+#define _RH_KABI_USE8(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE7(__VA_ARGS__)
+#define _RH_KABI_USE9(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE8(__VA_ARGS__)
+#define _RH_KABI_USE10(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE9(__VA_ARGS__)
+#define _RH_KABI_USE11(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE10(__VA_ARGS__)
+#define _RH_KABI_USE12(n, ...)	_RH_KABI_RESERVE(n); _RH_KABI_USE11(__VA_ARGS__)
+
+#define _RH_KABI_USE(...)	_RH_KABI_REPLACE(__VA_ARGS__)
+#define RH_KABI_USE(n, ...)	_RH_KABI_USE(__PASTE(_RH_KABI_USE,
COUNT_ARGS(__VA_ARGS__))(n, __VA_ARGS__));
+
 /*
  * Macros for breaking up a reserved element into two smaller chunks using
  * an anonymous struct inside an anonymous union.

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1530