diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:19:22 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:19:22 +0200 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /arch/x86/kvm/paging_tmpl.h | |
| parent | Merge branch 'l7200' into devel (diff) | |
| parent | ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128 (diff) | |
| download | linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.xz linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.zip | |
Merge branch 'shmobile' into devel
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 89d66ca4d87c..2331bdc2b549 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -342,6 +342,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, /* advance table_gfn when emulating 1gb pages with 4k */ if (delta == 0) table_gfn += PT_INDEX(addr, level); + access &= gw->pte_access; } else { direct = 0; table_gfn = gw->table_gfn[level - 2]; |