---

 sparsemem-dave/arch/i386/mm/discontig.c |    2 +-
 sparsemem-dave/mm/page_alloc.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/mm/discontig.c~3_7_080_alloc_remap_i386-whitespace arch/i386/mm/discontig.c
--- sparsemem/arch/i386/mm/discontig.c~3_7_080_alloc_remap_i386-whitespace	2004-10-28 10:28:26.000000000 -0700
+++ sparsemem-dave/arch/i386/mm/discontig.c	2004-10-28 10:30:22.000000000 -0700
@@ -278,7 +278,7 @@ unsigned long __init setup_memory(void)
 		allocate_pgdat(nid);
 		printk ("node %d will remap to vaddr %08lx - %08lx\n", nid,
 			(ulong) node_remap_start_vaddr[nid],
-			(ulong) pfn_to_kaddr(highstart_pfn 
+			(ulong) pfn_to_kaddr(highstart_pfn
 			    + node_remap_offset[nid] + node_remap_size[nid]));
 	}
 	printk("High memory starts at vaddr %08lx\n",
diff -puN include/asm-i386/mmzone.h~3_7_080_alloc_remap_i386-whitespace include/asm-i386/mmzone.h
diff -puN mm/page_alloc.c~3_7_080_alloc_remap_i386-whitespace mm/page_alloc.c
--- sparsemem/mm/page_alloc.c~3_7_080_alloc_remap_i386-whitespace	2004-10-28 10:28:26.000000000 -0700
+++ sparsemem-dave/mm/page_alloc.c	2004-10-28 10:30:53.000000000 -0700
@@ -1474,7 +1474,7 @@ void zone_init_free_lists(struct pglist_
 #ifdef HAVE_ARCH_ALLOC_REMAP
 		map = (unsigned long *) alloc_remap(pgdat->node_id,
 			bitmap_size);
-		if (!map) 
+		if (!map)
 #endif
 			map = (unsigned long *) alloc_bootmem_node(pgdat,
 				bitmap_size);
_