* [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds
@ 2018-12-17 11:39 Paolo Abeni
2018-12-17 17:20 ` David Miller
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Paolo Abeni @ 2018-12-17 11:39 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller
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>
---
include/linux/indirect_call_wrapper.h | 4 ++--
1 file 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
--
2.19.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds
2018-12-17 11:39 [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds Paolo Abeni
@ 2018-12-17 17:20 ` David Miller
2018-12-17 17:20 ` [net-next] " Major Hayden
2018-12-17 17:47 ` [PATCH net-next] " Vivien Didelot
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-12-17 17:20 UTC (permalink / raw)
To: pabeni; +Cc: netdev
From: Paolo Abeni <pabeni@redhat.com>
Date: Mon, 17 Dec 2018 12:39:02 +0100
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [net-next] net: unbreak CONFIG_RETPOLINE=n builds
2018-12-17 11:39 [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds Paolo Abeni
2018-12-17 17:20 ` David Miller
@ 2018-12-17 17:20 ` Major Hayden
2018-12-17 17:47 ` [PATCH net-next] " Vivien Didelot
2 siblings, 0 replies; 4+ messages in thread
From: Major Hayden @ 2018-12-17 17:20 UTC (permalink / raw)
To: Paolo Abeni, netdev; +Cc: David S. Miller
On 12/17/18 5:39 AM, Paolo Abeni wrote:
> 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.
This fixed aarch64 builds for me. Thank you!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds
2018-12-17 11:39 [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds Paolo Abeni
2018-12-17 17:20 ` David Miller
2018-12-17 17:20 ` [net-next] " Major Hayden
@ 2018-12-17 17:47 ` Vivien Didelot
2 siblings, 0 replies; 4+ messages in thread
From: Vivien Didelot @ 2018-12-17 17:47 UTC (permalink / raw)
To: Paolo Abeni; +Cc: netdev, David S. Miller
Hi Paolo,
On Mon, 17 Dec 2018 12:39:02 +0100, Paolo Abeni <pabeni@redhat.com> wrote:
> 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>
This fixes my build on latest net-next:
Tested-by: Vivien Didelot <vivien.didelot@gmail.com>
Thanks,
Vivien
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-17 17:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-17 11:39 [PATCH net-next] net: unbreak CONFIG_RETPOLINE=n builds Paolo Abeni
2018-12-17 17:20 ` David Miller
2018-12-17 17:20 ` [net-next] " Major Hayden
2018-12-17 17:47 ` [PATCH net-next] " Vivien Didelot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox