10 files changed, 42 insertions, 78 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b594768b0241..51b0af1cebee 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,7 +6,7 @@ menu "Block devices"
 
 config BLK_DEV_FD
         tristate "Normal floppy disk support"
-        depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285
+        depends on ARCH_MAY_HAVE_PC_FDC
         ---help---
           If you want to use the floppy disk drive(s) of your PC under Linux,
           say Y. Information about this driver, especially important for IBM
@@ -408,54 +408,12 @@ config BLK_DEV_INITRD
           "real" root file system, etc. See <file:Documentation/initrd.txt>
           for details.
 
-config INITRAMFS_SOURCE
-        string "Initramfs source file(s)"
-        default ""
-        help
-          This can be either a single cpio archive with a .cpio suffix or a
-          space-separated list of directories and files for building the
-          initramfs image.  A cpio archive should contain a filesystem archive
-          to be used as an initramfs image.  Directories should contain a
-          filesystem layout to be included in the initramfs image.  Files
-          should contain entries according to the format described by the
-          "usr/gen_init_cpio" program in the kernel tree.
-
-          When multiple directories and files are specified then the
-          initramfs image will be the aggregate of all of them.
-
-          See <file:Documentation/early-userspace/README for more details.
-
-          If you are not sure, leave it blank.
-
-config INITRAMFS_ROOT_UID
-        int "User ID to map to 0 (user root)"
-        depends on INITRAMFS_SOURCE!=""
-        default "0"
-        help
-          This setting is only meaningful if the INITRAMFS_SOURCE is
-          contains a directory.  Setting this user ID (UID) to something
-          other than "0" will cause all files owned by that UID to be
-          owned by user root in the initial ramdisk image.
-
-          If you are not sure, leave it set to "0".
-
-config INITRAMFS_ROOT_GID
-        int "Group ID to map to 0 (group root)"
-        depends on INITRAMFS_SOURCE!=""
-        default "0"
-        help
-          This setting is only meaningful if the INITRAMFS_SOURCE is
-          contains a directory.  Setting this group ID (GID) to something
-          other than "0" will cause all files owned by that GID to be
-          owned by group root in the initial ramdisk image.
-
-          If you are not sure, leave it set to "0".
 
 #XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
 #for instance.
 config LBD
         bool "Support for Large Block Devices"
-        depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH || UML
+        depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
         help
           Say Y here if you want to attach large (bigger than 2TB) discs to
           your machine, or if you want to have a raid or loopback device
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 6e231c5a1199..ded33ba31acc 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -35,7 +35,7 @@ aoedev_newdev(ulong nframes)
         struct aoedev *d;
         struct frame *f, *e;
 
-        d = kcalloc(1, sizeof *d, GFP_ATOMIC);
+        d = kzalloc(sizeof *d, GFP_ATOMIC);
         if (d == NULL)
                 return NULL;
         f = kcalloc(nframes, sizeof *f, GFP_ATOMIC);
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 9e6f51c528b0..4be976940f69 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -120,7 +120,7 @@ aoenet_xmit(struct sk_buff *sl)
  * (1) len doesn't include the header by default.  I want this. 
  */
 static int
-aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt)
+aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev)
 {
         struct aoe_hdr *h;
         u32 n;
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index cd056e7e64ec..30c0903c7cdd 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -2260,8 +2260,6 @@ static void cfq_put_cfqd(struct cfq_data *cfqd)
         if (!atomic_dec_and_test(&cfqd->ref))
                 return;
 
-        blk_put_queue(q);
-
         cfq_shutdown_timer_wq(cfqd);
         q->elevator->elevator_data = NULL;
 
@@ -2318,7 +2316,6 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e)
         e->elevator_data = cfqd;
 
         cfqd->queue = q;
-        atomic_inc(&q->refcnt);
 
         cfqd->max_queued = q->nr_requests / 4;
         q->nr_batching = cfq_queued;
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
index 5be6f998d8c5..3d4261c39f16 100644
--- a/drivers/block/cryptoloop.c
+++ b/drivers/block/cryptoloop.c
@@ -57,9 +57,11 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info)
         mode = strsep(&cmsp, "-");
 
         if (mode == NULL || strcmp(mode, "cbc") == 0)
-                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC);
+                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC |
+                                               CRYPTO_TFM_REQ_MAY_SLEEP);
         else if (strcmp(mode, "ecb") == 0)
-                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB);
+                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB |
+                                               CRYPTO_TFM_REQ_MAY_SLEEP);
         if (tfm == NULL)
                 return -EINVAL;
 
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index ff5201e02153..24594c57c323 100644
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -507,18 +507,12 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
         const int reads = !list_empty(&dd->fifo_list[READ]);
         const int writes = !list_empty(&dd->fifo_list[WRITE]);
         struct deadline_rq *drq;
-        int data_dir, other_dir;
+        int data_dir;
 
         /*
          * batches are currently reads XOR writes
          */
-        drq = NULL;
-
-        if (dd->next_drq[READ])
-                drq = dd->next_drq[READ];
-
-        if (dd->next_drq[WRITE])
-                drq = dd->next_drq[WRITE];
+        drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
 
         if (drq) {
                 /* we have a "next request" */
@@ -544,7 +538,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
                         goto dispatch_writes;
 
                 data_dir = READ;
-                other_dir = WRITE;
 
                 goto dispatch_find_request;
         }
@@ -560,7 +553,6 @@ dispatch_writes:
                 dd->starved = 0;
 
                 data_dir = WRITE;
-                other_dir = READ;
 
                 goto dispatch_find_request;
         }
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index f0c1084b840f..888dad5eef34 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -493,6 +493,8 @@ static struct floppy_struct user_params[N_DRIVE];
 
 static sector_t floppy_sizes[256];
 
+static char floppy_device_name[] = "floppy";
+
 /*
  * The driver is trying to determine the correct media format
  * while probing is set. rw_interrupt() clears it after a
@@ -4191,18 +4193,24 @@ static int __init floppy_setup(char *str)
 
 static int have_no_fdc = -ENODEV;
 
+static ssize_t floppy_cmos_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *p;
+        int drive;
+
+        p = container_of(dev, struct platform_device,dev);
+        drive = p->id;
+        return sprintf(buf, "%X\n", UDP->cmos);
+}
+DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL);
+
 static void floppy_device_release(struct device *dev)
 {
         complete(&device_release);
 }
 
-static struct platform_device floppy_device = {
-        .name           = "floppy",
-        .id             = 0,
-        .dev            = {
-                        .release = floppy_device_release,
-                        }
-};
+static struct platform_device floppy_device[N_DRIVE];
 
 static struct kobject *floppy_find(dev_t dev, int *part, void *data)
 {
@@ -4370,20 +4378,26 @@ static int __init floppy_init(void)
                 goto out_flush_work;
         }
 
-        err = platform_device_register(&floppy_device);
-        if (err)
-                goto out_flush_work;
-
         for (drive = 0; drive < N_DRIVE; drive++) {
                 if (!(allowed_drive_mask & (1 << drive)))
                         continue;
                 if (fdc_state[FDC(drive)].version == FDC_NONE)
                         continue;
+
+                floppy_device[drive].name = floppy_device_name;
+                floppy_device[drive].id = drive;
+                floppy_device[drive].dev.release = floppy_device_release;
+
+                err = platform_device_register(&floppy_device[drive]);
+                if (err)
+                        goto out_flush_work;
+
+                device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
                 /* to be cleaned up... */
                 disks[drive]->private_data = (void *)(long)drive;
                 disks[drive]->queue = floppy_queue;
                 disks[drive]->flags |= GENHD_FL_REMOVABLE;
-                disks[drive]->driverfs_dev = &floppy_device.dev;
+                disks[drive]->driverfs_dev = &floppy_device[drive].dev;
                 add_disk(disks[drive]);
         }
 
@@ -4603,10 +4617,11 @@ void cleanup_module(void)
                     fdc_state[FDC(drive)].version != FDC_NONE) {
                         del_gendisk(disks[drive]);
                         unregister_devfs_entries(drive);
+                        device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
+                        platform_device_unregister(&floppy_device[drive]);
                 }
                 put_disk(disks[drive]);
         }
-        platform_device_unregister(&floppy_device);
         devfs_remove("floppy");
 
         del_timer_sync(&fd_timeout);
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 47fd3659a061..d42840cc0d1d 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -45,7 +45,7 @@ int get_blkdev_list(char *p, int used)
         struct blk_major_name *n;
         int i, len;
 
-        len = sprintf(p, "\nBlock devices:\n");
+        len = snprintf(p, (PAGE_SIZE-used), "\nBlock devices:\n");
 
         down(&block_subsys_sem);
         for (i = 0; i < ARRAY_SIZE(major_names); i++) {
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 0c7599563b65..483d71b10cf9 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -235,8 +235,8 @@ void blk_queue_make_request(request_queue_t * q, make_request_fn * mfn)
          * set defaults
          */
         q->nr_requests = BLKDEV_MAX_RQ;
-        q->max_phys_segments = MAX_PHYS_SEGMENTS;
-        q->max_hw_segments = MAX_HW_SEGMENTS;
+        blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
+        blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
         q->make_request_fn = mfn;
         q->backing_dev_info.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
         q->backing_dev_info.state = 0;
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 46e56a25d2c8..e46ecd23b3ac 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -776,7 +776,7 @@ static int viodasd_remove(struct vio_dev *vdev)
  */
 static struct vio_device_id viodasd_device_table[] __devinitdata = {
         { "viodasd", "" },
-        { 0, }
+        { "", "" }
 };
 
 MODULE_DEVICE_TABLE(vio, viodasd_device_table);