From: Frederic Weisbecker <fweisbecker@suse.de>
Date: Sun, 13 Feb 2022 23:19:16 +0100
Subject: [PATCH] static_call: Fix tools headers
Patch-mainline: Never, fix for internal patches, upstream will use static keys.
References: bsc#1194975
Static call tool headers need to be sync with the Linux one.
Signed-off-by: Frederic Weisbecker <fweisbecker@suse.de>
---
tools/include/linux/static_call_types.h | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--- a/tools/include/linux/static_call_types.h
+++ b/tools/include/linux/static_call_types.h
@@ -18,6 +18,9 @@
#define STATIC_CALL_TRAMP(name) __PASTE(STATIC_CALL_TRAMP_PREFIX, name)
#define STATIC_CALL_TRAMP_STR(name) __stringify(STATIC_CALL_TRAMP(name))
+#define STATIC_CALL_TYPE_PREFIX __SCtype__
+#define STATIC_CALL_TYPE(name) __PASTE(STATIC_CALL_TYPE_PREFIX, name)
+
/*
* Flags in the low bits of static_call_site::key.
*/
@@ -36,11 +39,13 @@ struct static_call_site {
#define DECLARE_STATIC_CALL(name, func) \
extern struct static_call_key STATIC_CALL_KEY(name); \
- extern typeof(func) STATIC_CALL_TRAMP(name);
+ extern struct static_call_tramp STATIC_CALL_TRAMP(name); \
+ extern typeof(func) STATIC_CALL_TYPE(name)
#ifdef CONFIG_HAVE_STATIC_CALL
-#define __raw_static_call(name) (&STATIC_CALL_TRAMP(name))
+#define __raw_static_call(name) \
+ ((typeof(&STATIC_CALL_TYPE(name)))&STATIC_CALL_TRAMP(name))
#ifdef CONFIG_HAVE_STATIC_CALL_INLINE
@@ -96,7 +101,7 @@ struct static_call_key {
};
#define static_call(name) \
- ((typeof(STATIC_CALL_TRAMP(name))*)(STATIC_CALL_KEY(name).func))
+ ((typeof(&STATIC_CALL_TYPE(name)))(STATIC_CALL_KEY(name).func))
#endif /* CONFIG_HAVE_STATIC_CALL */