diff options
| author | Gleb Natapov | 2013-11-04 09:20:57 +0100 |
|---|---|---|
| committer | Gleb Natapov | 2013-11-04 09:20:57 +0100 |
| commit | 95f328d3ad1a8e4e3175a18546fb35c495e31130 (patch) | |
| tree | 2f6496ef8354e9a0a315f23faef744f93fee8265 /arch/s390 | |
| parent | KVM: x86: fix emulation of "movzbl %bpl, %eax" (diff) | |
| parent | kvm: powerpc: book3s: drop is_hv_enabled (diff) | |
| download | kernel-qcow2-linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.tar.gz kernel-qcow2-linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.tar.xz kernel-qcow2-linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.zip | |
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
Conflicts:
arch/powerpc/include/asm/processor.h
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 1e4e7b97337a..bedda67cc222 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -1089,12 +1089,13 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) return VM_FAULT_SIGBUS; } -void kvm_arch_free_memslot(struct kvm_memory_slot *free, +void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, struct kvm_memory_slot *dont) { } -int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages) +int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, + unsigned long npages) { return 0; } |