3 files changed, 14 insertions, 4 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a4a311992408..4245b7f80a49 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,6 +6,12 @@ menuconfig BLK_DEV
         bool "Block devices"
         depends on BLOCK
         default y
+        ---help---
+          Say Y here to get to see options for various different block device
+          drivers. This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled;
+          only do this if you know what you are doing.
 
 if BLK_DEV
 
@@ -62,6 +68,7 @@ config AMIGA_Z2RAM
 config BLK_DEV_XD
         tristate "XT hard disk support"
         depends on ISA && ISA_DMA_API
+        select CHECK_SIGNATURE
         help
           Very old 8 bit hard disk controllers used in the IBM XT computer
           will be supported if you say Y here.
diff --git a/drivers/block/lguest_blk.c b/drivers/block/lguest_blk.c
index 93e3c4001bf5..160cf14431ac 100644
--- a/drivers/block/lguest_blk.c
+++ b/drivers/block/lguest_blk.c
@@ -308,9 +308,12 @@ static int lguestblk_probe(struct lguest_device *lgdev)
         }
 
         /* This allocates a "struct gendisk" where we pack all the information
-         * about the disk which the rest of Linux sees.  We ask for one minor
-         * number; I do wonder if we should be asking for more. */
-        bd->disk = alloc_disk(1);
+         * about the disk which the rest of Linux sees.  The argument is the
+         * number of minor devices desired: we need one minor for the main
+         * disk, and one for each partition.  Of course, we can't possibly know
+         * how many partitions are on the disk (add_disk does that).
+         */
+        bd->disk = alloc_disk(16);
         if (!bd->disk) {
                 err = -ENOMEM;
                 goto out_unregister_blkdev;
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4dff49256ac2..317a790c153b 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -417,7 +417,7 @@ static int __send_request(struct request *req)
         desc->req_id = port->req_id;
         desc->operation = op;
         if (port->vdisk_type == VD_DISK_TYPE_DISK) {
-                desc->slice = 2;
+                desc->slice = 0xff;
         } else {
                 desc->slice = 0;
         }