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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk.h
diff --git
a/block/blk.h
b/block/blk.h
index d2e49af90db548ffa68e950bd800a48fdde79a1d..6e1ed40534e97e78ff0263268b2826344f2207b7 100644
(file)
--- a/
block/blk.h
+++ b/
block/blk.h
@@
-99,8
+99,8
@@
static inline int queue_congestion_off_threshold(struct request_queue *q)
static inline int blk_cpu_to_group(int cpu)
{
#ifdef CONFIG_SCHED_MC
static inline int blk_cpu_to_group(int cpu)
{
#ifdef CONFIG_SCHED_MC
- c
pumask_t mask = cpu_coregroup_map
(cpu);
- return
first_cpu
(mask);
+ c
onst struct cpumask *mask = cpu_coregroup_mask
(cpu);
+ return
cpumask_first
(mask);
#elif defined(CONFIG_SCHED_SMT)
return first_cpu(per_cpu(cpu_sibling_map, cpu));
#else
#elif defined(CONFIG_SCHED_SMT)
return first_cpu(per_cpu(cpu_sibling_map, cpu));
#else