patch-2.1.129 linux/drivers/block/genhd.c

• Lines: 42
• Date: Mon Nov 16 10:32:58 1998
• Orig file: v2.1.128/linux/drivers/block/genhd.c
• Orig date: Fri Oct 23 22:01:20 1998

diff -u --recursive --new-file v2.1.128/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -61,6 +61,10 @@
 extern int scsi_dev_init(void);
 extern int net_dev_init(void);
 
+#ifdef CONFIG_PPC
+extern void note_bootable_part(kdev_t dev, int part);
+#endif
+
 /*
  * disk_name() is used by genhd.c and md.c.
  * It formats the devicename of the indicated disk
@@ -862,7 +866,7 @@
 	int blk, blocks_in_map;
 	int dev_bsize, dev_pos, pos;
 	unsigned secsize;
-#ifdef CONFIG_PMAC
+#ifdef CONFIG_PPC
 	int first_bootable = 1;
 #endif
 	struct mac_partition *part;
@@ -916,18 +920,18 @@
 			fsec + be32_to_cpu(part->start_block) * (secsize/512),
 			be32_to_cpu(part->block_count) * (secsize/512));
 
-#ifdef CONFIG_PMAC
+#ifdef CONFIG_PPC
 		/*
 		 * If this is the first bootable partition, tell the
 		 * setup code, in case it wants to make this the root.
 		 */
-		if (first_bootable
+		if ( (_machine == _MACH_Pmac) && first_bootable
 		    && (be32_to_cpu(part->status) & MAC_STATUS_BOOTABLE)
 		    && strcasecmp(part->processor, "powerpc") == 0) {
 			note_bootable_part(dev, blk);
 			first_bootable = 0;
 		}
-#endif /* CONFIG_PMAC */
+#endif /* CONFIG_PPC */
 
 		++current_minor;
 	}