[OS-BUILD PATCH 14/18] kabi: more consistent _RH_KABI_SIZE_AND_EXTEND

From: Čestmír Kalina <ckalina(a)redhat.com&gt; kabi: more consistent _RH_KABI_SIZE_AND_EXTEND Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2024595 Upstream Status: RHEL only commit df58e09e5bb20bcaf1670733f7d40f92ed4f2bce Author: Jiri Benc <jbenc(a)redhat.com&gt; Date: Wed, 1 Apr 2020 13:04:13 -0400 The convention in rh_kabi.h is that the underscored versions of macros do not add the trailing semicolon, while the normal versions do. This is not the case for _RH_KABI_SIZE_AND_EXTEND[_PTR], which add the semicolon. Those macros were introduced by commit 531826346544 ("redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.") for a different reason but since we have them now, we might as well make them consistent. 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 @@ -378,15 +378,15 @@ */ #define _RH_KABI_SIZE_AND_EXTEND_PTR(_struct) \ size_t _struct##_size_rh; \ - RH_KABI_EXCLUDE(struct _struct##_rh *_rh) + _RH_KABI_EXCLUDE(struct _struct##_rh *_rh) #define RH_KABI_SIZE_AND_EXTEND_PTR(_struct) \ - _RH_KABI_SIZE_AND_EXTEND_PTR(_struct) + _RH_KABI_SIZE_AND_EXTEND_PTR(_struct); #define _RH_KABI_SIZE_AND_EXTEND(_struct) \ size_t _struct##_size_rh; \ - RH_KABI_EXCLUDE(struct _struct##_rh _rh) + _RH_KABI_EXCLUDE(struct _struct##_rh _rh) #define RH_KABI_SIZE_AND_EXTEND(_struct) \ - _RH_KABI_SIZE_AND_EXTEND(_struct) + _RH_KABI_SIZE_AND_EXTEND(_struct); /* * RH_KABI_SET_SIZE calculates and sets the size of the extended struct and -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1530