git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
drivers
/
block
/
null_blk.c
diff --git
a/drivers/block/null_blk.c
b/drivers/block/null_blk.c
index
528f4e4
..
a2e69d2
100644
(file)
--- a/
drivers/block/null_blk.c
+++ b/
drivers/block/null_blk.c
@@
-537,6
+537,9
@@
static int null_add_dev(void)
spin_lock_init(&nullb->lock);
+ if (queue_mode == NULL_Q_MQ && use_per_node_hctx)
+ submit_queues = nr_online_nodes;
+
if (setup_queues(nullb))
goto err;