Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9109f4eb847b7c0be61ae25fb21b1ce2acc9c2d6

Authored by Linus Torvalds
2 parents a1a54303d1 d0dfc6b74a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 2 changed files Side-by-side Diff

arch/x86/kvm/i8259.c
Diff comments   View file @ 9109f4e
... ... @@ -575,6 +575,8 @@
575 575 s->pics[1].elcr_mask = 0xde;
576 576 s->pics[0].pics_state = s;
577 577 s->pics[1].pics_state = s;
  578 + s->pics[0].isr_ack = 0xff;
  579 + s->pics[1].isr_ack = 0xff;
578 580  
579 581 /*
580 582 * Initialize PIO device
... ... @@ -2394,7 +2394,8 @@
2394 2394 ASSERT(!VALID_PAGE(root));
2395 2395 spin_lock(&vcpu->kvm->mmu_lock);
2396 2396 kvm_mmu_free_some_pages(vcpu);
2397   - sp = kvm_mmu_get_page(vcpu, i << 30, i << 30,
  2397 + sp = kvm_mmu_get_page(vcpu, i << (30 - PAGE_SHIFT),
  2398 + i << 30,
2398 2399 PT32_ROOT_LEVEL, 1, ACC_ALL,
2399 2400 NULL);
2400 2401 root = __pa(sp->spt);