diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
| commit | 1111b680d34bc19190f02a1b4479c3fcc592c22e (patch) | |
| tree | 9d45ad88b9354205a2d1fd76a338ab8693a16d86 /arch/x86/kvm/paging_tmpl.h | |
| parent | 37b6cb475a6d74bc047c53bc323d6eb3113e27a4 (diff) | |
| parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver 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 b1e6c1bf68d3..123efd3ec29f 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -353,7 +353,7 @@ retry_walk: walker->ptes[walker->level - 1] = pte; } while (!is_last_gpte(mmu, walker->level, pte)); - if (unlikely(permission_fault(mmu, pte_access, access))) { + if (unlikely(permission_fault(vcpu, mmu, pte_access, access))) { errcode |= PFERR_PRESENT_MASK; goto error; } |