ia64/xen-unstable

changeset 10408:bd1a0b2bb2d4

[LINUX] Only destroy a machine-contiguous memory region if
it really is contiguous (e.g., create_contiguous did not fail).
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Jun 15 11:35:23 2006 +0100 (2006-06-15)
parents 161473836da3
children 3e221d43cf19
files linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Wed Jun 14 22:15:13 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Thu Jun 15 11:35:23 2006 +0100
     1.3 @@ -365,7 +365,8 @@ void xen_destroy_contiguous_region(unsig
     1.4  	};
     1.5  	set_xen_guest_handle(reservation.extent_start, &frame);
     1.6  
     1.7 -	if (xen_feature(XENFEAT_auto_translated_physmap))
     1.8 +	if (xen_feature(XENFEAT_auto_translated_physmap) ||
     1.9 +	    !test_bit(__pa(vstart) >> PAGE_SHIFT, contiguous_bitmap))
    1.10  		return;
    1.11  
    1.12  	scrub_pages(vstart, 1 << order);