--- Gnu-Mach/linux/dev/drivers/block/genhd.c	2020/09/02 04:43:27	1.1.1.2
+++ Gnu-Mach/linux/dev/drivers/block/genhd.c	2020/09/02 04:46:00	1.1.1.3
@@ -39,6 +39,7 @@
 
 #ifdef MACH
 #include <machine/spl.h>
+#include <linux/dev/glue/glue.h>
 #endif
 
 #define SYS_IND(p)	get_unaligned(&p->sys_ind)
@@ -111,7 +112,7 @@ static void add_partition (struct gendis
 	printk(" %s", disk_name(hd, minor, buf));
 }
 
-#ifdef MACH
+#if defined (MACH) && defined (CONFIG_BSD_DISKLABEL)
 static int mach_minor;
 static void
 add_bsd_partition (struct gendisk *hd, int minor, int slice,
@@ -289,7 +290,7 @@ read_mbr:
 		printk(" unable to read partition table\n");
 		return -1;
 	}
-	data = bh->b_data;
+	data = (unsigned char *)bh->b_data;
 	/* In some cases we modify the geometry    */
 	/*  of the drive (below), so ensure that   */
 	/*  nobody else tries to re-use this data. */
@@ -770,9 +771,7 @@ void device_setup(void)
 	struct gendisk *p;
 	int nr=0;
 #ifdef MACH
-	extern int linux_intr_pri;
-
-	linux_intr_pri = SPL5;
+	linux_intr_pri = SPL6;
 #endif
 
 #ifndef MACH