aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-19 09:49:59 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-19 09:49:59 -0700
commit895e1fc7226e6732bc77138955b6c7dfa279f57a (patch)
tree61b1ec5d4d328c8e657ca25b19fa8f3cd899e6cb
parentac57b3a9ce280763296f99e32187a0b4384d9389 (diff)
parent6b8d0f9b180cb93513bb65f705b299370f0357a1 (diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: Fix off-by-one when writing to a nonpae guest pde
-rw-r--r--drivers/kvm/mmu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index e85b4c7c36f..cab26f301ea 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -1171,6 +1171,7 @@ void kvm_mmu_pre_write(struct kvm_vcpu *vcpu, gpa_t gpa, int bytes)
* and zap two pdes instead of one.
*/
if (level == PT32_ROOT_LEVEL) {
+ page_offset &= ~7; /* kill rounding error */
page_offset <<= 1;
npte = 2;
}