From 43674f80013d0fc2f42694aa1da2103d5eb5c81e Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Fri, 29 Dec 2006 16:49:58 -0800
Subject: [PATCH] --- yaml --- r: 45140 b: refs/heads/master c:
 55a54f79e091d52c3c2835985c347ea4d2e1c21f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 850c1e96e67b..a5754fce964e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c68876fd2846d2aaf9770276db244b46f2bf52c7
+refs/heads/master: 55a54f79e091d52c3c2835985c347ea4d2e1c21f
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 0e618bcfe1da..973544553cba 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -245,7 +245,8 @@ static void kvm_free_physmem_slot(struct kvm_memory_slot *free,
 	if (!dont || free->phys_mem != dont->phys_mem)
 		if (free->phys_mem) {
 			for (i = 0; i < free->npages; ++i)
-				__free_page(free->phys_mem[i]);
+				if (free->phys_mem[i])
+					__free_page(free->phys_mem[i]);
 			vfree(free->phys_mem);
 		}