Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103745
b: refs/heads/master
c: eff0114
h: refs/heads/master
i:
  103743: 1c01851
v: v3
  • Loading branch information
Carsten Otte authored and Avi Kivity committed Jul 20, 2008
1 parent d6e71a9 commit b5fd69b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f8b78fa3d406f3a2dc038e2b47749013a9295994
refs/heads/master: eff0114ac3d3a20a5c93b31b00134e59bfc75189
2 changes: 2 additions & 0 deletions trunk/virt/kvm/kvm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
r = -ENOMEM;

/* Allocate if a slot is being created */
#ifndef CONFIG_S390
if (npages && !new.rmap) {
new.rmap = vmalloc(npages * sizeof(struct page *));

Expand Down Expand Up @@ -399,6 +400,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
goto out_free;
memset(new.dirty_bitmap, 0, dirty_bytes);
}
#endif /* not defined CONFIG_S390 */

if (mem->slot >= kvm->nmemslots)
kvm->nmemslots = mem->slot + 1;
Expand Down

0 comments on commit b5fd69b

Please sign in to comment.