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

• Lines: 50
• Date: Wed Oct 20 22:13:20 1999
• Orig file: v2.3.22/linux/arch/ppc/kernel/mbx_setup.c
• Orig date: Tue Aug 31 17:29:13 1999

diff -u --recursive --new-file v2.3.22/linux/arch/ppc/kernel/mbx_setup.c linux/arch/ppc/kernel/mbx_setup.c
@@ -30,6 +30,7 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/blk.h>
+#include <linux/ide.h>
 #include <linux/ioport.h>
 
 #include <asm/mmu.h>
@@ -37,7 +38,6 @@
 #include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
-#include <asm/ide.h>
 #include <asm/mbx.h>
 #include <asm/machdep.h>
 
@@ -76,13 +76,12 @@
 }
 
 void __init
-mbx_setup_arch(unsigned long * memory_start_p, unsigned long * memory_end_p)
+mbx_setup_arch(void)
 {
 	int	cpm_page;
 	extern char cmd_line[];
 	
-	cpm_page = *memory_start_p;
-	*memory_start_p += PAGE_SIZE;
+	cpm_page = (int) alloc_bootmem_pages(PAGE_SIZE);
 	
 	sprintf(cmd_line,
 "%s root=/dev/nfs nfsroot=/sys/mbxroot",
@@ -104,6 +103,9 @@
 	rd_doload = 1;
 	rd_image_start = 0;
 #endif
+#if 0	/* XXX this may need to be updated for the new bootmem stuff,
+	   or possibly just deleted (see set_phys_avail() in init.c).
+	   - paulus. */
 	/* initrd_start and size are setup by boot/head.S and kernel/head.S */
 	if ( initrd_start )
 	{
@@ -115,6 +117,7 @@
 			initrd_start = 0;
 		}
 	}
+#endif
 #endif
 
 #ifdef notdef