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

linux-2.6.10-xen-sparse/arch/xen/i386/mm/init.c

@@ -661,7 +661,7 @@ void __init mem_init(void)
 	/* XEN: init and count low-mem pages outside initial allocation. */
 	for (pfn = xen_start_info.nr_pages; pfn < max_low_pfn; pfn++) {
 		ClearPageReserved(&mem_map[pfn]);
-		atomic_set(&mem_map[pfn].count, 1);
+		set_page_count(&mem_map[pfn], 1);
 		totalram_pages++;
 	}