projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
f2fs: trace in batches extent info update
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-mq-cpumap.c
diff --git
a/block/blk-mq-cpumap.c
b/block/blk-mq-cpumap.c
index 1e28ddb656b891b92d7c135fa65914939b1451aa..8764c241e5bb44858e753b75f6c102c06a927171 100644
(file)
--- a/
block/blk-mq-cpumap.c
+++ b/
block/blk-mq-cpumap.c
@@
-31,7
+31,8
@@
static int get_first_sibling(unsigned int cpu)
return cpu;
}
return cpu;
}
-int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues)
+int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues,
+ const struct cpumask *online_mask)
{
unsigned int i, nr_cpus, nr_uniq_cpus, queue, first_sibling;
cpumask_var_t cpus;
{
unsigned int i, nr_cpus, nr_uniq_cpus, queue, first_sibling;
cpumask_var_t cpus;
@@
-41,7
+42,7
@@
int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues)
cpumask_clear(cpus);
nr_cpus = nr_uniq_cpus = 0;
cpumask_clear(cpus);
nr_cpus = nr_uniq_cpus = 0;
- for_each_
online_cpu(i
) {
+ for_each_
cpu(i, online_mask
) {
nr_cpus++;
first_sibling = get_first_sibling(i);
if (!cpumask_test_cpu(first_sibling, cpus))
nr_cpus++;
first_sibling = get_first_sibling(i);
if (!cpumask_test_cpu(first_sibling, cpus))
@@
-51,7
+52,7
@@
int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues)
queue = 0;
for_each_possible_cpu(i) {
queue = 0;
for_each_possible_cpu(i) {
- if (!cpu
_online(i
)) {
+ if (!cpu
mask_test_cpu(i, online_mask
)) {
map[i] = 0;
continue;
}
map[i] = 0;
continue;
}
@@
-95,7
+96,7
@@
unsigned int *blk_mq_make_queue_map(struct blk_mq_tag_set *set)
if (!map)
return NULL;
if (!map)
return NULL;
- if (!blk_mq_update_queue_map(map, set->nr_hw_queues))
+ if (!blk_mq_update_queue_map(map, set->nr_hw_queues
, cpu_online_mask
))
return map;
kfree(map);
return map;
kfree(map);