Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue

Conflicts:
	arch/powerpc/include/asm/processor.h

1 files changed, 10 insertions, 6 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 82c4047aa0e3..7a317a7f9025 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -187,6 +187,7 @@ void kvm_flush_remote_tlbs(struct kvm *kvm)
                 ++kvm->stat.remote_tlb_flush;
         cmpxchg(&kvm->tlbs_dirty, dirty_count, 0);
 }
+EXPORT_SYMBOL_GPL(kvm_flush_remote_tlbs);
 
 void kvm_reload_remote_mmus(struct kvm *kvm)
 {
@@ -541,13 +542,13 @@ static void kvm_destroy_dirty_bitmap(struct kvm_memory_slot *memslot)
 /*
  * Free any memory in @free but not in @dont.
  */
-static void kvm_free_physmem_slot(struct kvm_memory_slot *free,
+static void kvm_free_physmem_slot(struct kvm *kvm, struct kvm_memory_slot *free,
                                   struct kvm_memory_slot *dont)
 {
         if (!dont || free->dirty_bitmap != dont->dirty_bitmap)
                 kvm_destroy_dirty_bitmap(free);
 
-        kvm_arch_free_memslot(free, dont);
+        kvm_arch_free_memslot(kvm, free, dont);
 
         free->npages = 0;
 }
@@ -558,7 +559,7 @@ void kvm_free_physmem(struct kvm *kvm)
         struct kvm_memory_slot *memslot;
 
         kvm_for_each_memslot(memslot, slots)
-                kvm_free_physmem_slot(memslot, NULL);
+                kvm_free_physmem_slot(kvm, memslot, NULL);
 
         kfree(kvm->memslots);
 }
@@ -822,7 +823,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
         if (change == KVM_MR_CREATE) {
                 new.userspace_addr = mem->userspace_addr;
 
-                if (kvm_arch_create_memslot(&new, npages))
+                if (kvm_arch_create_memslot(kvm, &new, npages))
                         goto out_free;
         }
 
@@ -883,7 +884,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 
         kvm_arch_commit_memory_region(kvm, mem, &old, change);
 
-        kvm_free_physmem_slot(&old, &new);
+        kvm_free_physmem_slot(kvm, &old, &new);
         kfree(old_memslots);
 
         /*
@@ -905,7 +906,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 out_slots:
         kfree(slots);
 out_free:
-        kvm_free_physmem_slot(&new, &old);
+        kvm_free_physmem_slot(kvm, &new, &old);
 out:
         return r;
 }
@@ -964,6 +965,7 @@ int kvm_get_dirty_log(struct kvm *kvm,
 out:
         return r;
 }
+EXPORT_SYMBOL_GPL(kvm_get_dirty_log);
 
 bool kvm_largepages_enabled(void)
 {
@@ -1654,6 +1656,7 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn)
         memslot = gfn_to_memslot(kvm, gfn);
         mark_page_dirty_in_slot(kvm, memslot, gfn);
 }
+EXPORT_SYMBOL_GPL(mark_page_dirty);
 
 /*
  * The vCPU has executed a HLT instruction with in-kernel mode enabled.
@@ -1679,6 +1682,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
 
         finish_wait(&vcpu->wq, &wait);
 }
+EXPORT_SYMBOL_GPL(kvm_vcpu_block);
 
 #ifndef CONFIG_S390
 /*