# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 53270874cbc3c9eac195b087920a3f0f26562214
# Parent  424d5f06fe8ba0c9b25d67584a14bc2b232cb410
IA64 counter part of the change set
10353:bd1a0b2bb2d4596227951ad6d36cb4fcc2d00a8e of xen-unstable.hg
Only destroy a machine-contiguous memory region if it really is contiguous.
PATCHNAME: ia64_counter_part_of_10353

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 424d5f06fe8b -r 53270874cbc3 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri Jun 23 10:51:46 2006 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri Jun 23 10:51:48 2006 +0900
@@ -275,6 +275,9 @@ __xen_destroy_contiguous_region(unsigned
 	struct xen_memory_reservation reservation;
 	unsigned long i;
 
+	if (!test_bit(start_gpfn, contiguous_bitmap))
+		return;
+
 	gpfns = kmalloc(sizeof(gpfns[0]) * num_gpfn,
 			GFP_KERNEL | __GFP_NOFAIL);
 	for (i = 0; i < num_gpfn; i++) {