From: Sabrina Dubroca <sdubroca(a)redhat.com>
redhat: rh_kabi: move semicolon inside __RH_KABI_CHECK_SIZE
With the current implementation, an unnecessary semicolon is left
during the GENKSYMS pass (which doesn't matter since at the moment
__RH_KABI_CHECK_SIZE is only used during the !GENKSYMS pass -- it's
burried inside RH_KABI_EXTEND). This wouldn't cause any issue, but
could be confusing to other developers once we start using
__RH_KABI_CHECK_SIZE during the GENKSYMS pass.
Suggested-by: Jiri Benc <jbenc(a)redhat.com>
Signed-off-by: Sabrina Dubroca <sdubroca(a)redhat.com>
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
@@ -408,7 +408,7 @@
}
# define __RH_KABI_CHECK_SIZE(_item, _size) \
_Static_assert(sizeof(struct{_item;}) <= _size, \
- __FILE__ ":" __stringify(__LINE__) ": " __stringify(_item)
" is larger than the reserved size (" __stringify(_size) " bytes)"
RH_KABI_ALIGN_WARNING)
+ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_item)
" is larger than the reserved size (" __stringify(_size) " bytes)"
RH_KABI_ALIGN_WARNING);
#else
# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new)
# define __RH_KABI_CHECK_SIZE(_item, _size)
@@ -481,7 +481,7 @@
RH_KABI_EXTEND(union { \
_new; \
unsigned long RH_KABI_UNIQUE_ID[_size]; \
- __RH_KABI_CHECK_SIZE(_new, 8 * (_size)); \
+ __RH_KABI_CHECK_SIZE(_new, 8 * (_size)) \
})
#define _RH_KABI_AUX_PTR(_struct) \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1619