3 files changed, 11 insertions, 10 deletions

diff --git a/block/Kconfig b/block/Kconfig
index 43ca070dc0f8..5536839886ff 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -13,6 +13,7 @@ config LBD
 
 config BLK_DEV_IO_TRACE
         bool "Support for tracing block io actions"
+        depends on SYSFS
         select RELAY
         select DEBUG_FS
         help
diff --git a/block/genhd.c b/block/genhd.c
index 64510fd88621..db4c60c802d6 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -454,8 +454,8 @@ static ssize_t disk_stats_read(struct gendisk * disk, char *page)
         disk_round_stats(disk);
         preempt_enable();
         return sprintf(page,
-                "%8u %8u %8llu %8u "
-                "%8u %8u %8llu %8u "
+                "%8lu %8lu %8llu %8u "
+                "%8lu %8lu %8llu %8u "
                 "%8u %8u %8u"
                 "\n",
                 disk_stat_read(disk, ios[READ]),
@@ -649,7 +649,7 @@ static int diskstats_show(struct seq_file *s, void *v)
         preempt_disable();
         disk_round_stats(gp);
         preempt_enable();
-        seq_printf(s, "%4d %4d %s %u %u %llu %u %u %u %llu %u %u %u %u\n",
+        seq_printf(s, "%4d %4d %s %lu %lu %llu %u %lu %lu %llu %u %u %u %u\n",
                 gp->major, n + gp->first_minor, disk_name(gp, n, buf),
                 disk_stat_read(gp, ios[0]), disk_stat_read(gp, merges[0]),
                 (unsigned long long)disk_stat_read(gp, sectors[0]),
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index a2e333ad0b64..82469db25100 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -908,17 +908,15 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth)
                                 __FUNCTION__, depth);
         }
 
-        tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC);
+        tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC);
         if (!tag_index)
                 goto fail;
 
         nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;
-        tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
+        tag_map = kzalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
         if (!tag_map)
                 goto fail;
 
-        memset(tag_index, 0, depth * sizeof(struct request *));
-        memset(tag_map, 0, nr_ulongs * sizeof(unsigned long));
         tags->real_max_depth = depth;
         tags->max_depth = depth;
         tags->tag_index = tag_index;
@@ -2481,10 +2479,12 @@ void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
         rq->rq_disk = bd_disk;
         rq->flags |= REQ_NOMERGE;
         rq->end_io = done;
-        elv_add_request(q, rq, where, 1);
-        generic_unplug_device(q);
+        WARN_ON(irqs_disabled());
+        spin_lock_irq(q->queue_lock);
+        __elv_add_request(q, rq, where, 1);
+        __generic_unplug_device(q);
+        spin_unlock_irq(q->queue_lock);
 }
-
 EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);
 
 /**