Home Home > GIT Browse
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
commit218943a32de5e5df6d0774fff4a081f7922e71e5 (patch)
tree77c841cb3f3dce6763aec095c5beb571bd50b720
parent9be21e5dd61147ca5a62b909156ba1985c6cc170 (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. suse-commit: 76aae3b1af257d9ac47ff8446880608f4573934d
-rw-r--r--arch/x86/kernel/cpu/bugs.c2
-rw-r--r--net/core/filter.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a9a3168c190c..eaca4f3e08a4 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -180,12 +180,10 @@ void x86_spec_ctrl_restore_host(u64 guest_spec_ctrl)
}
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)
{
diff --git a/net/core/filter.c b/net/core/filter.c
index 431756f79ae1..82ab0469a257 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2001,11 +2001,9 @@ out:
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