Linus Torvalds wrote:

> 
> VM balacing fixes, sound should work again, and a lot of small details.
> 
>                 Linus
>  - pre7:
>     - official Compaq CISS driver.

There's a little annoying bug with printing partitions upon bootup.
Specifically my dmesg now looks like:

Partition check:
 hda: hda1 hda1
 hdb: hdb1 hdb1 hdb2 hdb2 hdb3 hdb3 < hdb5 hdb5 hdb6 hdb6 hdb7 hdb7 hdb8 hdb8 hd
b9 hdb9 hdb10 hdb10 >

The following attached patch should fix this.
I'd be happy if someone could verify that it's correct
(seeing that it's past 3am here).

Cheers,
Udo
--- linux/fs/partitions/check.c Tue Sep 26 03:32:45 2000
+++ patched/fs/partitions/check.c       Tue Sep 26 03:31:47 2000
@@ -187,14 +187,11 @@
 #ifdef CONFIG_DEVFS_FS
        printk(" p%d", (minor & ((1 << hd->minor_shift) - 1)));
 #else
-       if (hd->major >= COMPAQ_SMART2_MAJOR+0 && hd->major <= COMPAQ_SMART2_MAJOR+7)
+       if ((hd->major >= COMPAQ_SMART2_MAJOR+0 && hd->major <= COMPAQ_SMART2_MAJOR+7) 
+||
+           (hd->major >= COMPAQ_CISS_MAJOR+0 && hd->major <= COMPAQ_CISS_MAJOR+7))
                printk(" p%d", (minor & ((1 << hd->minor_shift) - 1)));
        else
                printk(" %s", disk_name(hd, minor, buf));
-       if (hd->major >= COMPAQ_CISS_MAJOR+0 && hd->major <= COMPAQ_CISS_MAJOR+7)
-                printk(" p%d", (minor & ((1 << hd->minor_shift) - 1)));
-        else
-                printk(" %s", disk_name(hd, minor, buf));
 #endif
 }
 

Reply via email to