diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /arch/ia64/kvm/misc.h | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/ia64/kvm/misc.h')
| -rw-r--r-- | arch/ia64/kvm/misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kvm/misc.h b/arch/ia64/kvm/misc.h index e585c4607344..dd979e00b574 100644 --- a/arch/ia64/kvm/misc.h +++ b/arch/ia64/kvm/misc.h | |||
| @@ -27,7 +27,8 @@ | |||
| 27 | */ | 27 | */ |
| 28 | static inline uint64_t *kvm_host_get_pmt(struct kvm *kvm) | 28 | static inline uint64_t *kvm_host_get_pmt(struct kvm *kvm) |
| 29 | { | 29 | { |
| 30 | return (uint64_t *)(kvm->arch.vm_base + KVM_P2M_OFS); | 30 | return (uint64_t *)(kvm->arch.vm_base + |
| 31 | offsetof(struct kvm_vm_data, kvm_p2m)); | ||
| 31 | } | 32 | } |
| 32 | 33 | ||
| 33 | static inline void kvm_set_pmt_entry(struct kvm *kvm, gfn_t gfn, | 34 | static inline void kvm_set_pmt_entry(struct kvm *kvm, gfn_t gfn, |