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
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[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 1065d7c65fa15b60b1104944322533033df69df7..5f13f4d0bcceda747589a300170537eefb4810eb 100644
(file)
--- a/
block/blk-mq-cpumap.c
+++ b/
block/blk-mq-cpumap.c
@@
-17,7
+17,7
@@
static int cpu_to_queue_index(unsigned int nr_cpus, unsigned int nr_queues,
const int cpu)
{
static int cpu_to_queue_index(unsigned int nr_cpus, unsigned int nr_queues,
const int cpu)
{
- return cpu
/ ((nr_cpus + nr_queues - 1) / nr_queues)
;
+ return cpu
* nr_queues / nr_cpus
;
}
static int get_first_sibling(unsigned int cpu)
}
static int get_first_sibling(unsigned int cpu)
@@
-90,7
+90,7
@@
unsigned int *blk_mq_make_queue_map(struct blk_mq_tag_set *set)
unsigned int *map;
/* If cpus are offline, map them to first hctx */
unsigned int *map;
/* If cpus are offline, map them to first hctx */
- map = kzalloc_node(sizeof(*map) * n
um_possible_cpus()
, GFP_KERNEL,
+ map = kzalloc_node(sizeof(*map) * n
r_cpu_ids
, GFP_KERNEL,
set->numa_node);
if (!map)
return NULL;
set->numa_node);
if (!map)
return NULL;