[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/platforms chrp_setup.c,1.4,1.5 gemini_setup.c,1.1,1.2 iSeries_setup.c,1.1,1.2 pmac_setup.c,1.3,1.4 pplus_setup.c,1.3,1.4 prep_setup.c,1.4,1.5 sandpoint_setup.c,1.3,1.4 spruce_setup.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/arch/ppc/platforms

Modified Files:
	chrp_setup.c gemini_setup.c iSeries_setup.c pmac_setup.c 
	pplus_setup.c prep_setup.c sandpoint_setup.c spruce_setup.c 
Log Message:
Synced to 2.5.22

Index: chrp_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/chrp_setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chrp_setup.c	16 May 2002 18:01:37 -0000	1.4
+++ chrp_setup.c	18 Jun 2002 18:51:54 -0000	1.5
@@ -37,6 +37,7 @@
 #include <linux/ide.h>
 #include <linux/irq.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -221,10 +222,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; /* sda2 (sda1 is for the kernel) */
 
 	/* Lookup PCI host bridges */
 	chrp_find_bridges();

Index: gemini_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/gemini_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gemini_setup.c	14 Mar 2002 22:32:22 -0000	1.1
+++ gemini_setup.c	18 Jun 2002 18:51:54 -0000	1.2
@@ -26,6 +26,7 @@
 #include <linux/console.h>
 #include <linux/irq.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -174,10 +175,10 @@
 #ifdef CONFIG_BLK_DEV_INITRD
 	/* bootable off CDROM */
 	if (initrd_start)
-		ROOT_DEV = MKDEV(SCSI_CDROM_MAJOR, 0);
+		ROOT_DEV = Root_SR0;
 	else
 #endif
-		ROOT_DEV = to_kdev_t(0x0801);
+		ROOT_DEV = Root_SDA1;
 
 	/* nothing but serial consoles... */
 	sprintf(cmd_line, "%s console=ttyS0", cmd_line);

Index: iSeries_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/iSeries_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- iSeries_setup.c	14 Mar 2002 22:32:22 -0000	1.1
+++ iSeries_setup.c	18 Jun 2002 18:51:54 -0000	1.2
@@ -24,6 +24,7 @@
 #include <linux/bootmem.h>
 #include <linux/blk.h>
 #include <linux/ide.h>
+#include <linux/root_dev.h>
 #include <linux/seq_file.h>
 
 #include <asm/processor.h>
@@ -154,7 +155,7 @@
 		initrd_start = xNaca.xRamDisk + KERNELBASE;
 		initrd_end   = initrd_start + xNaca.xRamDiskSize * PAGE_SIZE;
 		initrd_below_start_ok = 1;	// ramdisk in kernel space
-		ROOT_DEV = MKDEV( RAMDISK_MAJOR, 0 );
+		ROOT_DEV = Root_RAM0;
 
 		if ( ((rd_size*1024)/PAGE_SIZE) < xNaca.xRamDiskSize )
 			rd_size = (xNaca.xRamDiskSize*PAGE_SIZE)/1024;
@@ -163,7 +164,7 @@
 #endif /* CONFIG_BLK_DEV_INITRD */
 #if CONFIG_VIODASD_IDE
 	  {
-		ROOT_DEV = MKDEV( IDE0_MAJOR, 1 );
+		ROOT_DEV = Root_HDA1;
 	  }
 #elif defined(CONFIG_VIODASD)
 	  {

Index: pmac_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pmac_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pmac_setup.c	16 May 2002 18:01:37 -0000	1.3
+++ pmac_setup.c	18 Jun 2002 18:51:54 -0000	1.4
@@ -51,6 +51,7 @@
 #include <linux/pmu.h>
 #include <linux/irq.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/processor.h>
 #include <asm/sections.h>
@@ -307,10 +308,10 @@
 #endif
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start)
-		ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
+		ROOT_DEV = Root_RAM0;
 	else
 #endif
-		ROOT_DEV = to_kdev_t(DEFAULT_ROOT_DEVICE);
+		ROOT_DEV = DEFAULT_ROOT_DEVICE;
 
 #ifdef CONFIG_SMP
 	/* Check for Core99 */
@@ -434,7 +435,7 @@
 	if (!initializing)
 		return;
 	if ((goodness <= current_root_goodness) &&
-	    !kdev_same(ROOT_DEV, to_kdev_t(DEFAULT_ROOT_DEVICE)))
+	    ROOT_DEV != DEFAULT_ROOT_DEVICE)
 		return;
 	p = strstr(saved_command_line, "root=");
 	if (p != NULL && (p == saved_command_line || p[-1] == ' '))
@@ -445,7 +446,7 @@
 		found_boot = 1;
 	}
 	if (kdev_same(boot_dev, NODEV) || kdev_same(dev, boot_dev)) {
-		ROOT_DEV = mk_kdev(major(dev), minor(dev) + part);
+		ROOT_DEV = MKDEV(major(dev), minor(dev) + part);
 		boot_dev = NODEV;
 		current_root_goodness = goodness;
 	}

Index: pplus_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pplus_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pplus_setup.c	3 Jun 2002 22:44:57 -0000	1.3
+++ pplus_setup.c	18 Jun 2002 18:51:54 -0000	1.4
@@ -47,6 +47,7 @@
 #include <linux/ide.h>
 #include <linux/kdev_t.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/sections.h>
 #include <asm/mmu.h>
@@ -120,13 +121,13 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start)
-		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); /* /dev/ram */
+		ROOT_DEV = Root_RAM0;
 	else
 #endif
 #ifdef CONFIG_ROOT_NFS
-		ROOT_DEV = to_kdev_t(0x00ff); /* /dev/nfs */
+		ROOT_DEV = Root_NFS;
 #else
-		ROOT_DEV = to_kdev_t(0x0802); /* /dev/sda2 */
+		ROOT_DEV = Root_SDA2;
 #endif
 
 	printk("PowerPlus port (C) 2001 MontaVista Software, Inc. (so...@mv...)\n");

Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prep_setup.c	3 Jun 2002 22:44:57 -0000	1.4
+++ prep_setup.c	18 Jun 2002 18:51:54 -0000	1.5
@@ -40,6 +40,7 @@
 #include <linux/pci.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/sections.h>
 #include <asm/mmu.h>
@@ -335,20 +336,20 @@
 	case _PREP_IBM:
 		/* Enable L2.  Assume we don't need to flush -- Cort*/
 		*(unsigned char *)(0x8000081c) |= 3;
-		ROOT_DEV = to_kdev_t(0x0301); /* hda1 */
+		ROOT_DEV = Root_HDA1;
 		break;
 	case _PREP_Motorola:
 		/* Enable L2.  Assume we don't need to flush -- Cort*/
 		*(unsigned char *)(0x8000081c) |= 3;
 #ifdef CONFIG_BLK_DEV_INITRD
 		if (initrd_start)
-			ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0); /* /dev/ram */
+			ROOT_DEV = Root_RAM0;
 		else
 #endif
 #ifdef CONFIG_ROOT_NFS
-			ROOT_DEV = to_kdev_t(0x00ff); /* /dev/nfs */
+			ROOT_DEV = Root_NFS;
 #else
-			ROOT_DEV = to_kdev_t(0x0802); /* /dev/sda2 */
+			ROOT_DEV = Root_SDA2;
 #endif
 		break;
 	}

Index: sandpoint_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/sandpoint_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sandpoint_setup.c	3 Jun 2002 22:44:57 -0000	1.3
+++ sandpoint_setup.c	18 Jun 2002 18:51:54 -0000	1.4
@@ -72,6 +72,7 @@
 #include <linux/irq.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -151,13 +152,13 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start)
-		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+		ROOT_DEV = Root_RAM0;
 	else
 #endif
 #ifdef	CONFIG_ROOT_NFS
-		ROOT_DEV = to_kdev_t(0x00FF);	/* /dev/nfs pseudo device */
+		ROOT_DEV = Root_NFS;
 #else
-		ROOT_DEV = to_kdev_t(0x0301);	/* /dev/hda1 IDE disk */
+		ROOT_DEV = Root_HDA1;
 #endif
 
 	/* Lookup PCI host bridges */

Index: spruce_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/spruce_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- spruce_setup.c	14 Mar 2002 22:32:22 -0000	1.1
+++ spruce_setup.c	18 Jun 2002 18:51:54 -0000	1.2
@@ -44,6 +44,7 @@
 #include <linux/delay.h>
 #include <linux/seq_file.h>
 #include <linux/ide.h>
+#include <linux/root_dev.h>
 
 #include <asm/keyboard.h>
 #include <asm/system.h>
@@ -135,13 +136,13 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start)
-		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); /* /dev/ram */
+		ROOT_DEV = Root_RAM0;
 	else
 #endif
 #ifdef CONFIG_ROOT_NFS
-		ROOT_DEV = to_kdev_t(0x00FF);	/* /dev/nfs pseudo device */
+		ROOT_DEV = Root_NFS;
 #else
-		ROOT_DEV = to_kdev_t(0x0801);	/* /dev/sda1 */
+		ROOT_DEV = Root_SDA1;
 #endif
 
 #ifdef CONFIG_DUMMY_CONSOLE