Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-06-06 10:45:08 +0200
committerMichal Kubecek <mkubecek@suse.cz>2019-06-06 10:45:16 +0200
commitdbad7a1e07ff2ab66725296f42531c9cc8e1b525 (patch)
treee8c3652bb4874a6ce855b424c673dfcfebd9d40f
parentf11941be57b4d4b4116e4f54cfed80fbb01a96cf (diff)
net: unbreak CONFIG_RETPOLINE=n builds (bsc#1124503).
-rw-r--r--patches.fixes/net-unbreak-CONFIG_RETPOLINE-n-builds.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.fixes/net-unbreak-CONFIG_RETPOLINE-n-builds.patch b/patches.fixes/net-unbreak-CONFIG_RETPOLINE-n-builds.patch
new file mode 100644
index 0000000000..7e1646f316
--- /dev/null
+++ b/patches.fixes/net-unbreak-CONFIG_RETPOLINE-n-builds.patch
@@ -0,0 +1,37 @@
+From: Paolo Abeni <pabeni@redhat.com>
+Date: Mon, 17 Dec 2018 12:39:02 +0100
+Subject: net: unbreak CONFIG_RETPOLINE=n builds
+Patch-mainline: v5.0-rc1
+Git-commit: c03b0358ab60504151b35587c88205c7b7fe22be
+References: bsc#1124503
+
+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>
+Acked-by: Michal Kubecek <mkubecek@suse.cz>
+
+---
+ include/linux/indirect_call_wrapper.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- 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
diff --git a/series.conf b/series.conf
index e481147e83..161f965c05 100644
--- a/series.conf
+++ b/series.conf
@@ -20619,6 +20619,7 @@
patches.fixes/net-use-indirect-call-wrappers-at-GRO-network-layer.patch
patches.fixes/net-use-indirect-call-wrappers-at-GRO-transport-laye.patch
patches.fixes/udp-use-indirect-call-wrappers-for-GRO-socket-lookup.patch
+ patches.fixes/net-unbreak-CONFIG_RETPOLINE-n-builds.patch
patches.fixes/mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch
patches.drivers/Bluetooth-Fix-unnecessary-error-message-for-HCI-requ.patch
patches.fixes/igb-Fix-an-issue-that-PME-is-not-enabled-during-runt.patch