Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/arch/ppc64/kernel
Modified Files:
chrp_setup.c iSeries_setup.c setup.c
Log Message:
Synced to 2.5.22
Index: chrp_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/chrp_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- chrp_setup.c 3 May 2002 22:16:46 -0000 1.3
+++ chrp_setup.c 18 Jun 2002 18:51:54 -0000 1.4
@@ -42,6 +42,7 @@
#include <linux/irq.h>
#include <linux/seq_file.h>
+#include <linux/root_dev.h>
#include <asm/mmu.h>
#include <asm/processor.h>
@@ -139,10 +140,10 @@
initrd_below_start_ok = 1;
if (initrd_start)
- ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
+ ROOT_DEV = Root_RAM0;
else
#endif
- ROOT_DEV = to_kdev_t(0x0802); /* sda2 (sda1 is for the kernel) */
+ ROOT_DEV = Root_SDA2;
printk("Boot arguments: %s\n", cmd_line);
Index: iSeries_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/iSeries_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iSeries_setup.c 3 May 2002 22:16:46 -0000 1.3
+++ iSeries_setup.c 18 Jun 2002 18:51:54 -0000 1.4
@@ -27,6 +27,7 @@
#include <linux/bootmem.h>
#include <linux/blk.h>
#include <linux/seq_file.h>
+#include <linux/root_dev.h>
#include <asm/processor.h>
#include <asm/machdep.h>
@@ -295,7 +296,7 @@
initrd_start = (unsigned long)__va(naca->xRamDisk);
initrd_end = initrd_start + naca->xRamDiskSize * PAGE_SIZE;
initrd_below_start_ok = 1; // ramdisk in kernel space
- ROOT_DEV = mk_kdev( RAMDISK_MAJOR, 0 );
+ ROOT_DEV = Root_RAM0;
if ( ((rd_size*1024)/PAGE_SIZE) < naca->xRamDiskSize )
rd_size = (naca->xRamDiskSize*PAGE_SIZE)/1024;
@@ -304,7 +305,7 @@
#endif /* CONFIG_BLK_DEV_INITRD */
{
- /* ROOT_DEV = mk_kdev( VIODASD_MAJOR, 1 ); */
+ /* ROOT_DEV = MKDEV( VIODASD_MAJOR, 1 ); */
}
iSeries_recal_tb = get_tb();
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.c 4 Jun 2002 19:45:08 -0000 1.5
+++ setup.c 18 Jun 2002 18:51:54 -0000 1.6
@@ -22,6 +22,7 @@
#include <linux/seq_file.h>
#include <linux/ioport.h>
#include <linux/tty.h>
+#include <linux/root_dev.h>
#include <asm/init.h>
#include <asm/io.h>
#include <asm/prom.h>
@@ -372,7 +373,7 @@
if ((initrd_start == 0) && r3 && r4 && r4 != 0xdeadbeef) {
initrd_start = (r3 >= KERNELBASE) ? r3 : (unsigned long)__va(r3);
initrd_end = initrd_start + r4;
- ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
+ ROOT_DEV = Root_RAM0;
initrd_below_start_ok = 1;
}
#endif
@@ -463,7 +464,7 @@
case BI_INITRD:
initrd_start = (unsigned long)__va(rec->data[0]);
initrd_end = initrd_start + rec->data[1];
- ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
+ ROOT_DEV = Root_RAM0;
initrd_below_start_ok = 1;
break;
#endif /* CONFIG_BLK_DEV_INITRD */
|
