From: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Date: Wed, 27 Feb 2013 10:46:27 +0000 (+0900)
Subject: KVM: ARM: Remove kvm_arch_set_memory_region()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=16014753b10b76385600cd59450a70b8650c72cb;p=deliverable%2Flinux.git

KVM: ARM: Remove kvm_arch_set_memory_region()

This was replaced with prepare/commit long before:

  commit f7784b8ec9b6a041fa828cfbe9012fe51933f5ac
  KVM: split kvm_arch_set_memory_region into prepare and commit

Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index b32dc446e802..e4ad0bb01843 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -220,14 +220,6 @@ long kvm_arch_dev_ioctl(struct file *filp,
 	return -EINVAL;
 }
 
-int kvm_arch_set_memory_region(struct kvm *kvm,
-			       struct kvm_userspace_memory_region *mem,
-			       struct kvm_memory_slot old,
-			       int user_alloc)
-{
-	return 0;
-}
-
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
 				   struct kvm_memory_slot *memslot,
 				   struct kvm_userspace_memory_region *mem,