diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/powerpc/kvm/book3s.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/powerpc/kvm/book3s.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index a459479995c6..e41ac6f7dcf1 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c | |||
| @@ -498,7 +498,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, | |||
| 498 | 498 | ||
| 499 | /* If nothing is dirty, don't bother messing with page tables. */ | 499 | /* If nothing is dirty, don't bother messing with page tables. */ |
| 500 | if (is_dirty) { | 500 | if (is_dirty) { |
| 501 | memslot = &kvm->memslots->memslots[log->slot]; | 501 | memslot = id_to_memslot(kvm->memslots, log->slot); |
| 502 | 502 | ||
| 503 | ga = memslot->base_gfn << PAGE_SHIFT; | 503 | ga = memslot->base_gfn << PAGE_SHIFT; |
| 504 | ga_end = ga + (memslot->npages << PAGE_SHIFT); | 504 | ga_end = ga + (memslot->npages << PAGE_SHIFT); |