tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm

* 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
KVM: x86 emulator: fix Src2CL decode
KVM: MMU: fix incorrect return of spte

Linus Torvalds 231e58e7 a2b49102

+3 -2
+1 -1
arch/x86/kvm/emulate.c
··· 3603 3603 break; 3604 3604 case Src2CL: 3605 3605 ctxt->src2.bytes = 1; 3606 - ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0x8; 3606 + ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0xff; 3607 3607 break; 3608 3608 case Src2ImmByte: 3609 3609 rc = decode_imm(ctxt, &ctxt->src2, 1, true);
+2 -1
arch/x86/kvm/mmu.c
··· 400 400 401 401 /* xchg acts as a barrier before the setting of the high bits */ 402 402 orig.spte_low = xchg(&ssptep->spte_low, sspte.spte_low); 403 - orig.spte_high = ssptep->spte_high = sspte.spte_high; 403 + orig.spte_high = ssptep->spte_high; 404 + ssptep->spte_high = sspte.spte_high; 404 405 count_spte_clear(sptep, spte); 405 406 406 407 return orig.spte;