diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
| commit | fafd883f671dfc1c2f62009179920f27abc784a1 (patch) | |
| tree | 0eccb0baf343cad79a54e352598921db9ca17620 /arch/ia64/kvm/kvm-ia64.c | |
| parent | 92519bbc8af612975410def52bd462ca9af85cdb (diff) | |
| parent | d8b11a0cbd1c66ce283eb9dabe0498dfa6483f32 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes before applying new patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 5b2dc0d10c8f..bdfd8789b376 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -1560,6 +1560,10 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages) return 0; } +void kvm_arch_memslots_updated(struct kvm *kvm) +{ +} + int kvm_arch_prepare_memory_region(struct kvm *kvm, struct kvm_memory_slot *memslot, struct kvm_userspace_memory_region *mem, |