From b5fd69bba8b9d1107b356b0bfb57ae21d622c44b Mon Sep 17 00:00:00 2001
From: Carsten Otte <cotte@de.ibm.com>
Date: Fri, 27 Jun 2008 15:05:31 +0200
Subject: [PATCH] --- yaml --- r: 103745 b: refs/heads/master c:
 eff0114ac3d3a20a5c93b31b00134e59bfc75189 h: refs/heads/master i:   103743:
 1c0185141ccdbe1938474b0a5ec593d5a703d3bf v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e6774ff643a1..6f1afa1f2295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8b78fa3d406f3a2dc038e2b47749013a9295994
+refs/heads/master: eff0114ac3d3a20a5c93b31b00134e59bfc75189
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 7d10dfa0d388..9ccaf8f5402e 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -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 *));
 
@@ -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;