ia64/xen-unstable

changeset 4210:60fdb1da841d

bitkeeper revision 1.1159.272.1 (423ad23cVUXoD_eqhx9vK868Hg9Xlg)

manualmerge
author iap10@tetris.cl.cam.ac.uk
date Fri Mar 18 13:06:04 2005 +0000 (2005-03-18)
parents 6ac7c6ea6fc2 d3e7dab61056
children dbdf796cd98c
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Fri Mar 18 09:18:26 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Fri Mar 18 13:06:04 2005 +0000
     1.3 @@ -1495,7 +1495,9 @@ void __init setup_arch(char **cmdline_p)
     1.4  	if (max_pfn != xen_start_info.nr_pages) {
     1.5  		phys_to_machine_mapping = alloc_bootmem_low_pages(
     1.6  			max_pfn * sizeof(unsigned long));
     1.7 +
     1.8  		if (max_pfn > xen_start_info.nr_pages) {
     1.9 +			/* set to INVALID_P2M_ENTRY */                        
    1.10  			memset(phys_to_machine_mapping, ~0,
    1.11  				max_pfn * sizeof(unsigned long));
    1.12  			memcpy(phys_to_machine_mapping,