Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-05-29 21:42:53 +0200
committerJiri Kosina <jkosina@suse.cz>2018-05-29 21:42:53 +0200
commit80e68150d4153fdb6bf428fbaf2057d3a47bcfd2 (patch)
tree139c1e9074d0e048e4a321341df96ec11d24a5ab
parente1d6830fc1fc07b0958b79e9ad4f21ea2e667a67 (diff)
Refresh patches.kabi/bpf-ssbd-removal-workaround.patch: make sure therpm-3.0.101-108.52
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 e8cc899d32..6b5785d1ff 100644
--- a/patches.kabi/bpf-ssbd-removal-workaround.patch
+++ b/patches.kabi/bpf-ssbd-removal-workaround.patch
@@ -9,24 +9,22 @@ 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
-@@ -820,3 +820,10 @@ static void x86_amd_ssbd_disable(void)
+@@ -820,3 +820,8 @@ static void x86_amd_ssbd_disable(void)
if (boot_cpu_has(X86_FEATURE_AMD_SSBD))
wrmsrl(MSR_AMD64_LS_CFG, msrval);
}
+
-+#ifdef __GENKSYMS__
+void x86_sync_spec_ctrl(void)
+{
+}
+EXPORT_SYMBOL_GPL(x86_sync_spec_ctrl);
-+#endif
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -168,6 +168,8 @@ extern int sk_attach_filter(struct sock_
@@ -48,16 +46,14 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
#include <net/ip.h>
#include <net/protocol.h>
#include <net/netlink.h>
-@@ -670,3 +671,12 @@ int sk_detach_filter(struct sock *sk)
+@@ -670,3 +671,10 @@ int sk_detach_filter(struct sock *sk)
return ret;
}
EXPORT_SYMBOL_GPL(sk_detach_filter);
+
-+#ifdef __GENKSYMS__
+DEFINE_PER_CPU(unsigned int, bpf_prog_ran);
+EXPORT_SYMBOL_GPL(bpf_prog_ran);
+void bpf_leave_prog_deferred(const struct sk_filter *fp)
+{
+}
+EXPORT_SYMBOL_GPL(bpf_leave_prog_deferred);
-+#endif