diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
| commit | 329f0a8a35a664fb33f58f10538f5440ee19c54e (patch) | |
| tree | 270e7764e6fe54c982626bd2af294cedf4afbc5f /arch/x86/kvm/x86.c | |
| parent | a5fa2660d787d8416f426cd622778a5d8851ac36 (diff) | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| download | linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.gz linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.bz2 linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.zip | |
Merge 4.13-rc2 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5b8f07889f6a..82a63c59f77b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -597,8 +597,8 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu) (unsigned long *)&vcpu->arch.regs_avail)) return true; - gfn = (kvm_read_cr3(vcpu) & ~31u) >> PAGE_SHIFT; - offset = (kvm_read_cr3(vcpu) & ~31u) & (PAGE_SIZE - 1); + gfn = (kvm_read_cr3(vcpu) & ~31ul) >> PAGE_SHIFT; + offset = (kvm_read_cr3(vcpu) & ~31ul) & (PAGE_SIZE - 1); r = kvm_read_nested_guest_page(vcpu, gfn, pdpte, offset, sizeof(pdpte), PFERR_USER_MASK | PFERR_WRITE_MASK); if (r < 0) |