diff options
| author | Paolo Bonzini | 2015-11-04 16:24:17 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2015-11-04 16:24:17 +0100 |
| commit | 197a4f4b063e4e7a603ff1de56b3cf0400fabc30 (patch) | |
| tree | 36a3d057cec3aff49cf2fe9df3e63218595dd68b /arch/s390/include/asm | |
| parent | Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr() (diff) | |
| download | kernel-qcow2-linux-197a4f4b063e4e7a603ff1de56b3cf0400fabc30.tar.gz kernel-qcow2-linux-197a4f4b063e4e7a603ff1de56b3cf0400fabc30.tar.xz kernel-qcow2-linux-197a4f4b063e4e7a603ff1de56b3cf0400fabc30.zip | |
Merge tag 'kvm-arm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.4-rc1
Includes a number of fixes for the arch-timer, introducing proper
level-triggered semantics for the arch-timers, a series of patches to
synchronously halt a guest (prerequisite for IRQ forwarding), some tracepoint
improvements, a tweak for the EL2 panic handlers, some more VGIC cleanups
getting rid of redundant state, and finally a stylistic change that gets rid of
some ctags warnings.
Conflicts:
arch/x86/include/asm/kvm_host.h
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/kvm_host.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 8ced426091e1..72a614c68ed8 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -644,5 +644,7 @@ static inline void kvm_arch_memslots_updated(struct kvm *kvm, struct kvm_memslot static inline void kvm_arch_flush_shadow_all(struct kvm *kvm) {} static inline void kvm_arch_flush_shadow_memslot(struct kvm *kvm, struct kvm_memory_slot *slot) {} +static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {} +static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {} #endif |