patch-2.4.0-test10 linux/arch/sh/kernel/setup.c

• Lines: 34
• Date: Mon Oct 16 15:25:46 2000
• Orig file: v2.4.0-test9/linux/arch/sh/kernel/setup.c
• Orig date: Wed Aug 9 13:59:04 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/sh/kernel/setup.c linux/arch/sh/kernel/setup.c
@@ -166,17 +166,13 @@
 }
 
 static struct console sh_console = {
-	"bios",
-	sh_console_write,
-	NULL,
-	sh_console_device,
-	sh_console_wait_key,
-	NULL,
-	sh_console_setup,
-	CON_PRINTBUFFER,
-	-1,
-	0,
-	NULL
+	name:		"bios",
+	write:		sh_console_write,
+	device:		sh_console_device,
+	wait_key:	sh_console_wait_key,
+	setup:		sh_console_setup,
+	flags:		CON_PRINTBUFFER,
+	index:		-1,
 };
 
 void sh_console_init(void)
@@ -371,7 +367,7 @@
 	 * bootstrap step all allocations (until the page allocator
 	 * is intact) must be done via bootmem_alloc().
 	 */
-	bootmap_size = init_bootmem_node(0, start_pfn,
+	bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,
 					 __MEMORY_START>>PAGE_SHIFT, 
 					 max_low_pfn);