patch-2.4.19 linux-2.4.19/fs/partitions/mac.c

• Lines: 91
• Date: Fri Aug 2 17:39:45 2002
• Orig file: linux-2.4.18/fs/partitions/mac.c
• Orig date: Mon Oct 1 20:03:26 2001

diff -urN linux-2.4.18/fs/partitions/mac.c linux-2.4.19/fs/partitions/mac.c
@@ -20,22 +20,10 @@
 #include "check.h"
 #include "mac.h"
 
-#ifdef CONFIG_ALL_PPC
-extern void note_bootable_part(kdev_t dev, int part, int goodness);
-#endif
-
 /*
  * Code to understand MacOS partition tables.
  */
 
-static inline void mac_fix_string(char *stg, int len)
-{
-	int i;
-
-	for (i = len - 1; i >= 0 && stg[i] == ' '; i--)
-		stg[i] = 0;
-}
-
 int mac_partition(struct gendisk *hd, struct block_device *bdev,
 		unsigned long fsec, int first_part_minor)
 {
@@ -43,10 +31,6 @@
 	unsigned char *data;
 	int blk, blocks_in_map;
 	unsigned secsize;
-#ifdef CONFIG_ALL_PPC
-	int found_root = 0;
-	int found_root_goodness = 0;
-#endif
 	struct mac_partition *part;
 	struct mac_driver_desc *md;
 
@@ -83,56 +67,8 @@
 			fsec + be32_to_cpu(part->start_block) * (secsize/512),
 			be32_to_cpu(part->block_count) * (secsize/512));
 
-#ifdef CONFIG_ALL_PPC
-		/*
-		 * If this is the first bootable partition, tell the
-		 * setup code, in case it wants to make this the root.
-		 */
-		if (_machine == _MACH_Pmac) {
-			int goodness = 0;
-
-			mac_fix_string(part->processor, 16);
-			mac_fix_string(part->name, 32);
-			mac_fix_string(part->type, 32);					
-		    
-			if ((be32_to_cpu(part->status) & MAC_STATUS_BOOTABLE)
-			    && strcasecmp(part->processor, "powerpc") == 0)
-				goodness++;
-
-			if (strcasecmp(part->type, "Apple_UNIX_SVR2") == 0
-			    || (strnicmp(part->type, "Linux", 5) == 0
-			        && strcasecmp(part->type, "Linux_swap") != 0)) {
-				int i, l;
-
-				goodness++;
-				l = strlen(part->name);
-				if (strcmp(part->name, "/") == 0)
-					goodness++;
-				for (i = 0; i <= l - 4; ++i) {
-					if (strnicmp(part->name + i, "root",
-						     4) == 0) {
-						goodness += 2;
-						break;
-					}
-				}
-				if (strnicmp(part->name, "swap", 4) == 0)
-					goodness--;
-			}
-
-			if (goodness > found_root_goodness) {
-				found_root = blk;
-				found_root_goodness = goodness;
-			}
-		}
-#endif /* CONFIG_ALL_PPC */
-
 		++first_part_minor;
 	}
-#ifdef CONFIG_ALL_PPC
-	if (found_root_goodness)
-		note_bootable_part(to_kdev_t(bdev->bd_dev),
-					found_root, found_root_goodness);
-#endif
 
 	put_dev_sector(sect);
 	printk("\n");