patch-2.4.7 linux/drivers/block/rd.c

• Lines: 29
• Date: Sun Jul 15 16:15:44 2001
• Orig file: v2.4.6/linux/drivers/block/rd.c
• Orig date: Fri Feb 9 11:30:22 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/block/rd.c linux/drivers/block/rd.c
@@ -466,7 +466,7 @@
  *	romfs
  * 	gzip
  */
-int __init 
+static int __init 
 identify_ramdisk_image(kdev_t device, struct file *fp, int start_block)
 {
 	const int size = 512;
@@ -570,8 +570,9 @@
 	char *buf;
 	unsigned short rotate = 0;
 	unsigned short devblocks = 0;
+#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES)
 	char rotator[4] = { '|' , '/' , '-' , '\\' };
-
+#endif
 	ram_device = MKDEV(MAJOR_NR, unit);
 
 	if ((inode = get_empty_inode()) == NULL)
@@ -672,7 +673,7 @@
 		}
 		infile.f_op->read(&infile, buf, BLOCK_SIZE, &infile.f_pos);
 		outfile.f_op->write(&outfile, buf, BLOCK_SIZE, &outfile.f_pos);
-#if !defined(CONFIG_ARCH_S390)
+#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES)
 		if (!(i % 16)) {
 			printk("%c\b", rotator[rotate & 0x3]);
 			rotate++;