On Tue, 2020-06-23 at 09:42 -0700, Brian Vazquez wrote:
> There are many places where 2 annotations are not enough. This patch
> adds INDIRECT_CALL_3 and INDIRECT_CALL_4 to cover such cases.
>
> Signed-off-by: Brian Vazquez <bria...@google.com>
> ---
> include/linux/indirect_call_wrapper.h | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/include/linux/indirect_call_wrapper.h
> b/include/linux/indirect_call_wrapper.h
> index 00d7e8e919c6..54c02c84906a 100644
> --- a/include/linux/indirect_call_wrapper.h
> +++ b/include/linux/indirect_call_wrapper.h
> @@ -23,6 +23,16 @@
> likely(f == f2) ? f2(__VA_ARGS__) : \
> INDIRECT_CALL_1(f, f1, __VA_ARGS__); \
> })
> +#define INDIRECT_CALL_3(f, f3, f2, f1, ...)
> \
> + ({
> \
> + likely(f == f3) ? f3(__VA_ARGS__) :
> \
> + INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__);
> \
> + })
> +#define INDIRECT_CALL_4(f, f4, f3, f2, f1, ...)
> \
> + ({
> \
> + likely(f == f4) ? f4(__VA_ARGS__) :
> \
> + INDIRECT_CALL_3(f, f3, f2, f1, __VA_ARGS__);
> \
> + })
>
> #define INDIRECT_CALLABLE_DECLARE(f) f
> #define INDIRECT_CALLABLE_SCOPE
> @@ -30,6 +40,8 @@
> #else
> #define INDIRECT_CALL_1(f, f1, ...) f(__VA_ARGS__)
> #define INDIRECT_CALL_2(f, f2, f1, ...) f(__VA_ARGS__)
> +#define INDIRECT_CALL_3(f, f3, f2, f1, ...) f(__VA_ARGS__)
> +#define INDIRECT_CALL_4(f, f4, f3, f2, f1, ...) f(__VA_ARGS__)
> #define INDIRECT_CALLABLE_DECLARE(f)
> #define INDIRECT_CALLABLE_SCOPE static
> #endif
Acked-by: Paolo Abeni <pab...@redhat.com>
