[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/kernel m8xx_setup.c,1.1,1.2 ppc_ksyms.c,1.8,1.9 setup.c,1.2,1.3

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

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

Modified Files:
	m8xx_setup.c ppc_ksyms.c setup.c 
Log Message:
Synced to 2.5.22

Index: m8xx_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/m8xx_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- m8xx_setup.c	14 Mar 2002 22:32:22 -0000	1.1
+++ m8xx_setup.c	18 Jun 2002 18:51:54 -0000	1.2
@@ -34,6 +34,7 @@
 #include <linux/ioport.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/mmu.h>
 #include <asm/processor.h>
@@ -76,12 +77,12 @@
 #endif
 
 #ifdef notdef
-	ROOT_DEV = to_kdev_t(0x0301); /* hda1 */
+	ROOT_DEV = Root_HDA1; /* hda1 */
 #endif
 
 #ifdef CONFIG_BLK_DEV_INITRD
 #if 0
-	ROOT_DEV = to_kdev_t(0x0200); /* floppy */
+	ROOT_DEV = Root_FD0; /* floppy */
 	rd_prompt = 1;
 	rd_doload = 1;
 	rd_image_start = 0;

Index: ppc_ksyms.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc_ksyms.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ppc_ksyms.c	16 May 2002 18:01:37 -0000	1.8
+++ ppc_ksyms.c	18 Jun 2002 18:51:54 -0000	1.9
@@ -216,7 +216,7 @@
 EXPORT_SYMBOL(__global_sti);
 EXPORT_SYMBOL(__global_save_flags);
 EXPORT_SYMBOL(__global_restore_flags);
-#ifdef SPINLOCK_DEBUG
+#ifdef CONFIG_DEBUG_SPINLOCK
 EXPORT_SYMBOL(_raw_spin_lock);
 EXPORT_SYMBOL(_raw_spin_unlock);
 EXPORT_SYMBOL(_raw_spin_trylock);

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c	16 May 2002 18:01:37 -0000	1.2
+++ setup.c	18 Jun 2002 18:51:54 -0000	1.3
@@ -17,6 +17,7 @@
 #include <linux/tty.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
+#include <linux/root_dev.h>
 
 #include <asm/residual.h>
 #include <asm/io.h>
@@ -430,7 +431,7 @@
 				r3 += KERNELBASE;
 			initrd_start = r3;
 			initrd_end = r3 + r4;
-			ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
+			ROOT_DEV = Root_RAM0;
 			initrd_below_start_ok = 1;
 		}
 #endif