Commit 9109f4eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: i8259: initialize isr_ack
  KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow
parents a1a54303 d0dfc6b7

arch/x86/kvm/i8259.c

+2 −0
Original line number Diff line number Diff line
@@ -575,6 +575,8 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm) 
	s->pics[1].elcr_mask = 0xde;

	s->pics[0].pics_state = s;

	s->pics[1].pics_state = s;

	s->pics[0].isr_ack = 0xff;

	s->pics[1].isr_ack = 0xff;



	/*

	 * Initialize PIO device

arch/x86/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -2394,7 +2394,8 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu) 
			ASSERT(!VALID_PAGE(root));

			spin_lock(&vcpu->kvm->mmu_lock);

			kvm_mmu_free_some_pages(vcpu);

			sp = kvm_mmu_get_page(vcpu, i << 30, i << 30,

			sp = kvm_mmu_get_page(vcpu, i << (30 - PAGE_SHIFT),

					      i << 30,

					      PT32_ROOT_LEVEL, 1, ACC_ALL,

					      NULL);

			root = __pa(sp->spt);