Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-05-29 22:09:56 +0200
committerJiri Kosina <jkosina@suse.cz>2018-05-29 22:09:56 +0200
commit76aae3b1af257d9ac47ff8446880608f4573934d (patch)
tree0be796fe88ececa8ce26c8b51354ae2470ab0e68
parent4e7c229f59482660fa5c3d8398f3e2c3d5f96042 (diff)
Refresh patches.kabi/bpf-ssbd-removal-workaround.patch: make sure therpm-4.4.132-94.33
symbols are there even in !__GENKSYMS__ build, making the workaround really robust wrt. 3rd party modules possibly built against the kernel that already contained those.
-rw-r--r--patches.kabi/bpf-ssbd-removal-workaround.patch14
1 files changed, 5 insertions, 9 deletions
diff --git a/patches.kabi/bpf-ssbd-removal-workaround.patch b/patches.kabi/bpf-ssbd-removal-workaround.patch
index dd2f6aea0b..e4764c233a 100644
--- a/patches.kabi/bpf-ssbd-removal-workaround.patch
+++ b/patches.kabi/bpf-ssbd-removal-workaround.patch
@@ -9,23 +9,21 @@ on them.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
- arch/x86/kernel/cpu/bugs.c | 7 +++++++
+ arch/x86/kernel/cpu/bugs.c | 5 +++++
include/linux/filter.h | 2 ++
- net/core/filter.c | 10 ++++++++++
- 3 files changed, 19 insertions(+)
+ net/core/filter.c | 8 ++++++++
+ 3 files changed, 15 insertions(+)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
-@@ -180,6 +180,13 @@ void x86_spec_ctrl_restore_host(u64 gues
+@@ -180,6 +180,11 @@ void x86_spec_ctrl_restore_host(u64 gues
}
EXPORT_SYMBOL_GPL(x86_spec_ctrl_restore_host);
-+#ifdef __GENKSYMS__
+void x86_sync_spec_ctrl(void)
+{
+}
+EXPORT_SYMBOL_GPL(x86_sync_spec_ctrl);
-+#endif
+
static void x86_amd_ssb_disable(void)
{
@@ -51,16 +49,14 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
#include <net/ip.h>
#include <net/protocol.h>
#include <net/netlink.h>
-@@ -1999,3 +2000,12 @@ out:
+@@ -1999,3 +2000,10 @@ out:
release_sock(sk);
return ret;
}
+
-+#ifdef __GENKSYMS__
+DEFINE_PER_CPU(unsigned int, bpf_prog_ran);
+EXPORT_SYMBOL_GPL(bpf_prog_ran);
+void bpf_leave_prog_deferred(const struct bpf_prog *fp)
+{
+}
+EXPORT_SYMBOL_GPL(bpf_leave_prog_deferred);
-+#endif