patch-2.3.23 linux/arch/ppc/kernel/setup.c

• Lines: 59
• Date: Wed Oct 20 22:13:20 1999
• Orig file: v2.3.22/linux/arch/ppc/kernel/setup.c
• Orig date: Fri Oct 15 15:25:13 1999

diff -u --recursive --new-file v2.3.22/linux/arch/ppc/kernel/setup.c linux/arch/ppc/kernel/setup.c
@@ -11,12 +11,11 @@
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/blk.h>
+#include <linux/ide.h>
 
 #include <asm/init.h>
 #include <asm/residual.h>
 #include <asm/io.h>
-#include <linux/ide.h>
-#include <asm/ide.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
 #include <asm/pgtable.h>
@@ -540,14 +539,12 @@
 	}
 }
 
-void __init setup_arch(char **cmdline_p,
-		       unsigned long * memory_start_p, unsigned long * memory_end_p)
+void __init setup_arch(char **cmdline_p)
 {
 	extern int panic_timeout;
 	extern char _etext[], _edata[];
 	extern char *klimit;
-	extern unsigned long find_available_memory(void);
-	extern unsigned long *end_of_DRAM;
+	extern void do_init_bootmem(void);
 
 #ifdef CONFIG_XMON
 	extern void xmon_map_scc(void);
@@ -556,22 +553,22 @@
 		xmon(0);
 #endif /* CONFIG_XMON */
 
-	/* reboot on panic */	
+	/* reboot on panic */
 	panic_timeout = 180;
 
 	init_mm.start_code = PAGE_OFFSET;
 	init_mm.end_code = (unsigned long) _etext;
 	init_mm.end_data = (unsigned long) _edata;
-	init_mm.brk = (unsigned long) klimit;	
+	init_mm.brk = (unsigned long) klimit;
 
 	/* Save unparsed command line copy for /proc/cmdline */
 	strcpy(saved_command_line, cmd_line);
 	*cmdline_p = cmd_line;
 
-	*memory_start_p = find_available_memory();
-	*memory_end_p = (unsigned long) end_of_DRAM;
+	/* set up the bootmem stuff with available memory */
+	do_init_bootmem();
 
-	ppc_md.setup_arch(memory_start_p, memory_end_p);
+	ppc_md.setup_arch();
 	/* clear the progress line */
 	if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
 }