Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2019-08-13 11:24:00 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-08-21 18:53:02 +0200
commit08f02649b5d62fe7253623657e23a4ed664e2591 (patch)
tree211e417fd64ffdfcd9c2c42ff9a0e26b7ddd2bda
parent8c294605dd643b26b043ac3f5f3463c72dd13f0f (diff)
Fix kABI after KVM fixes
-rw-r--r--patches.kabi/KVM-Fix-kABI.patch31
-rw-r--r--series.conf2
2 files changed, 33 insertions, 0 deletions
diff --git a/patches.kabi/KVM-Fix-kABI.patch b/patches.kabi/KVM-Fix-kABI.patch
new file mode 100644
index 0000000000..e9c01bc5b3
--- /dev/null
+++ b/patches.kabi/KVM-Fix-kABI.patch
@@ -0,0 +1,31 @@
+From: Joerg Roedel <jroedel@suse.de>
+Date: Tue, 23 Apr 2019 17:25:00 +0200
+Subject: [PATCH] KVM: Fix kABI for AMD SMAP Errata workaround
+Patch-mainline: never, kABI workaround
+References: bsc#1133149
+
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+---
+ arch/x86/include/asm/kvm_host.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/x86/include/asm/kvm_host.h
++++ b/arch/x86/include/asm/kvm_host.h
+@@ -1102,7 +1102,6 @@ struct kvm_x86_ops {
+ int (*update_pi_irte)(struct kvm *kvm, unsigned int host_irq,
+ uint32_t guest_irq, bool set);
+ void (*apicv_post_state_restore)(struct kvm_vcpu *vcpu);
+- bool (*dy_apicv_has_pending_interrupt)(struct kvm_vcpu *vcpu);
+
+ int (*set_hv_timer)(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc);
+ void (*cancel_hv_timer)(struct kvm_vcpu *vcpu);
+@@ -1121,6 +1120,9 @@ struct kvm_x86_ops {
+ int (*get_msr_feature)(struct kvm_msr_entry *entry);
+
+ bool (*need_emulation_on_page_fault)(struct kvm_vcpu *vcpu);
++#ifndef __GENKSYMS__
++ bool (*dy_apicv_has_pending_interrupt)(struct kvm_vcpu *vcpu);
++#endif
+ };
+
+ struct kvm_arch_async_pf {
diff --git a/series.conf b/series.conf
index c6a13dc4b2..647de9851c 100644
--- a/series.conf
+++ b/series.conf
@@ -49696,6 +49696,8 @@
# KVM
patches.suse/0001-kvm-Introduce-nopvspin-kernel-parameter.patch
+ patches.kabi/KVM-Fix-kABI.patch
+
########################################################
# You'd better have a good reason for adding a patch
# below here.