From 5713ba56a49f41a09b00a78fbd1a5a003750f08a Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 23 Jan 2008 18:14:23 +0200 Subject: [PATCH] --- yaml --- r: 93774 b: refs/heads/master c: 09566765efd034feba45611f9d0ae9a702f8bb1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/virt/kvm/kvm_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c0e58b498157..1223efcb4648 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c5027425ec23ded452879ee5d0775a9a90fb9bf +refs/heads/master: 09566765efd034feba45611f9d0ae9a702f8bb1d diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index 04595fe77efb..121e65cccc58 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -678,8 +678,10 @@ static int kvm_vcpu_fault(struct vm_area_struct *vma, struct vm_fault *vmf) if (vmf->pgoff == 0) page = virt_to_page(vcpu->run); +#ifdef CONFIG_X86 else if (vmf->pgoff == KVM_PIO_PAGE_OFFSET) page = virt_to_page(vcpu->arch.pio_data); +#endif else return VM_FAULT_SIGBUS; get_page(page);