net: unbreak CONFIG_RETPOLINE=n builds
authorPaolo Abeni <pabeni@redhat.com>
Mon, 17 Dec 2018 11:39:02 +0000 (12:39 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Dec 2018 17:19:49 +0000 (09:19 -0800)
The kbuild bot reported a build breakage with CONFIG_RETPOLINE=n
due to commit aaa5d90b395a ("net: use indirect call wrappers at
GRO network layer").
I screwed the wrapper implementation for such config.
Fix the issue properly ignoring the builtin symbols arguments,
when retpoline is not enabled.

Reported-by: kbuild test robot <lkp@intel.com>
Fixes: aaa5d90b395a ("net: use indirect call wrappers at GRO network layer")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/indirect_call_wrapper.h

index 7c8b7f4948af5690c67402cf8bf818856fff8e0c..00d7e8e919c64015ace1e3405a9f68d503679812 100644 (file)
@@ -28,8 +28,8 @@
 #define INDIRECT_CALLABLE_SCOPE
 
 #else
-#define INDIRECT_CALL_1(f, name, ...) f(__VA_ARGS__)
-#define INDIRECT_CALL_2(f, name, ...) f(__VA_ARGS__)
+#define INDIRECT_CALL_1(f, f1, ...) f(__VA_ARGS__)
+#define INDIRECT_CALL_2(f, f2, f1, ...) f(__VA_ARGS__)
 #define INDIRECT_CALLABLE_DECLARE(f)
 #define INDIRECT_CALLABLE_SCOPE                static
 #endif