aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2018-12-17 12:39:02 +0100
committerDavid S. Miller <davem@davemloft.net>2018-12-17 09:19:49 -0800
commitc03b0358ab60504151b35587c88205c7b7fe22be (patch)
tree1ab111fa01b79869c0c33353d16e9353dfa3c52d
parentMerge branch 'mlxsw-spectrum_acl-Add-Bloom-filter-support' (diff)
downloadlinux-dev-c03b0358ab60504151b35587c88205c7b7fe22be.tar.xz
linux-dev-c03b0358ab60504151b35587c88205c7b7fe22be.zip
net: unbreak CONFIG_RETPOLINE=n builds
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>
-rw-r--r--include/linux/indirect_call_wrapper.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/indirect_call_wrapper.h b/include/linux/indirect_call_wrapper.h
index 7c8b7f4948af..00d7e8e919c6 100644
--- a/include/linux/indirect_call_wrapper.h
+++ b/include/linux/indirect_call_wrapper.h
@@ -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