[Xen-changelog] [xen-unstable] [IA64] memory exchange: ia64 counter part of cs 10353 xen-unstable.hg

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID d107bfd5a4ae8c2fb49eb6fb4ce6f37660e22bfb
# Parent  cf4a70ab3f59b3199ddc58f80cc0ec9d11d5b5ea
[IA64] memory exchange: ia64 counter part of cs 10353 xen-unstable.hg

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.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c |    3 +++
 1 files changed, 3 insertions(+)

diff -r cf4a70ab3f59 -r d107bfd5a4ae 
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:04:12 
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Fri Jun 23 15:12:10 
2006 -0600
@@ -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++) {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog