diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 14:25:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 14:25:45 +0100 |
commit | 14ddde78c787248ada9da2f2d04900548ffcf342 (patch) | |
tree | 9ba43a7a6ce68ee3aeff714c3056ebfd934f2cfd /arch/x86/kvm/paging_tmpl.h | |
parent | 58122bf1d856a4ea9581d62a07c557d997d46a19 (diff) | |
parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
download | lwn-14ddde78c787248ada9da2f2d04900548ffcf342.tar.gz lwn-14ddde78c787248ada9da2f2d04900548ffcf342.zip |
Merge branch 'linus' into x86/fpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
-rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 6c9fed957cce..2ce4f05e81d3 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -249,7 +249,7 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, return ret; kvm_vcpu_mark_page_dirty(vcpu, table_gfn); - walker->ptes[level] = pte; + walker->ptes[level - 1] = pte; } return 0; } |