ia64/xen-unstable

changeset 3945:568708aa650c

bitkeeper revision 1.1236.1.33 (4220c1d4kWBTmwyNeriCfcEPm-7p4g)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Sat Feb 26 18:37:08 2005 +0000 (2005-02-26)
parents fd0c24d9b4de 8a2d8a8a5415
children da2ab74c30e1
files linux-2.6.10-xen-sparse/arch/xen/i386/mm/init.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/mm/init.c	Sat Feb 26 18:20:46 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/init.c	Sat Feb 26 18:37:08 2005 +0000
     1.3 @@ -661,7 +661,7 @@ void __init mem_init(void)
     1.4  	/* XEN: init and count low-mem pages outside initial allocation. */
     1.5  	for (pfn = xen_start_info.nr_pages; pfn < max_low_pfn; pfn++) {
     1.6  		ClearPageReserved(&mem_map[pfn]);
     1.7 -		atomic_set(&mem_map[pfn].count, 1);
     1.8 +		set_page_count(&mem_map[pfn], 1);
     1.9  		totalram_pages++;
    1.10  	}
    1.11