diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/kvm_para.h | 5 | ||||
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/s390/include/asm/kvm_para.h b/arch/s390/include/asm/kvm_para.h index 6964db226f83..a98832961035 100644 --- a/arch/s390/include/asm/kvm_para.h +++ b/arch/s390/include/asm/kvm_para.h | |||
@@ -149,6 +149,11 @@ static inline unsigned int kvm_arch_para_features(void) | |||
149 | return 0; | 149 | return 0; |
150 | } | 150 | } |
151 | 151 | ||
152 | static inline bool kvm_check_and_clear_guest_paused(void) | ||
153 | { | ||
154 | return false; | ||
155 | } | ||
156 | |||
152 | #endif | 157 | #endif |
153 | 158 | ||
154 | #endif /* __S390_KVM_PARA_H */ | 159 | #endif /* __S390_KVM_PARA_H */ |
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 217ce44395a4..d30c8350b949 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
@@ -423,6 +423,14 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) | |||
423 | return 0; | 423 | return 0; |
424 | } | 424 | } |
425 | 425 | ||
426 | int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) | ||
427 | { | ||
428 | /* kvm common code refers to this, but never calls it */ | ||
429 | BUG(); | ||
430 | return 0; | ||
431 | } | ||
432 | |||
433 | |||
426 | static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) | 434 | static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) |
427 | { | 435 | { |
428 | kvm_s390_vcpu_initial_reset(vcpu); | 436 | kvm_s390_vcpu_initial_reset(vcpu); |