Merge branch 'for-4.9/block-irq' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / block / blk-mq.h

diff --git a/block/blk-mq.h b/block/blk-mq.h
index c92bb7d..df6474c 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -12,8 +12,6 @@ struct blk_mq_ctx {
        unsigned int            cpu;
        unsigned int            index_hw;
 
        unsigned int            cpu;
        unsigned int            index_hw;
 

-       unsigned int            last_tag ____cacheline_aligned_in_smp;
-

        /* incremented at dispatch time */
        unsigned long           rq_dispatched[2];
        unsigned long           rq_merged;
        /* incremented at dispatch time */
        unsigned long           rq_dispatched[2];
        unsigned long           rq_merged;


@@ -67,15 +65,6 @@ extern void blk_mq_rq_timed_out(struct request *req, bool reserved);
 
 void blk_mq_release(struct request_queue *q);
 
 
 void blk_mq_release(struct request_queue *q);
 

-/*
- * Basic implementation of sparser bitmap, allowing the user to spread
- * the bits over more cachelines.
- */
-struct blk_align_bitmap {
-       unsigned long word;
-       unsigned long depth;
-} ____cacheline_aligned_in_smp;
-

 static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
                                           unsigned int cpu)
 {
 static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
                                           unsigned int cpu)
 {