x86/apic/msi: Unbreak DMAR and HPET MSI

[linux-2.6-microblaze.git] / block / blk-mq-debugfs.c

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index e0b2bc1..3f09bcb 100644 (file)
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -404,8 +404,7 @@ static bool hctx_show_busy_rq(struct request *rq, void *data, bool reserved)
        const struct show_busy_params *params = data;
 
        if (rq->mq_hctx == params->hctx)
-               __blk_mq_debugfs_rq_show(params->m,
-                                        list_entry_rq(&rq->queuelist));
+               __blk_mq_debugfs_rq_show(params->m, rq);
 
        return true;
 }
@@ -827,9 +826,6 @@ void blk_mq_debugfs_register(struct request_queue *q)
        struct blk_mq_hw_ctx *hctx;
        int i;
 
-       q->debugfs_dir = debugfs_create_dir(kobject_name(q->kobj.parent),
-                                           blk_debugfs_root);
-
        debugfs_create_files(q->debugfs_dir, q, blk_mq_debugfs_queue_attrs);
 
        /*
@@ -860,9 +856,7 @@ void blk_mq_debugfs_register(struct request_queue *q)
 
 void blk_mq_debugfs_unregister(struct request_queue *q)
 {
-       debugfs_remove_recursive(q->debugfs_dir);
        q->sched_debugfs_dir = NULL;
-       q->debugfs_dir = NULL;
 }
 
 static void blk_mq_debugfs_register_ctx(struct blk_mq_hw_ctx *hctx,