diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:43 +0800 |
| commit | b4bbeeb816c06fd59dea2ea82c7b5650eb185e65 (patch) | |
| tree | a9b57e3df7589fe3a8649c41eff9b49685b99aec /block | |
| parent | ee620ddd6581cf9779d27677f6f0f11e3f939a8c (diff) | |
| parent | 261e8dbdb94baf294d0c8d45de843bb3d928c90e (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 4 | ||||
| -rw-r--r-- | block/cfq-iosched.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 9f99a01b00e8..6cfc6b200366 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -842,7 +842,7 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx) return WORK_CPU_UNBOUND; if (--hctx->next_cpu_batch <= 0) { - int cpu = hctx->next_cpu, next_cpu; + int next_cpu; next_cpu = cpumask_next(hctx->next_cpu, hctx->cpumask); if (next_cpu >= nr_cpu_ids) @@ -850,8 +850,6 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx) hctx->next_cpu = next_cpu; hctx->next_cpu_batch = BLK_MQ_CPU_WORK_BATCH; - - return cpu; } return hctx->next_cpu; diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 3ad307ee6029..e04a7b8492cf 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1572,7 +1572,7 @@ static struct blkcg_policy_data *cfq_cpd_alloc(gfp_t gfp) { struct cfq_group_data *cgd; - cgd = kzalloc(sizeof(*cgd), GFP_KERNEL); + cgd = kzalloc(sizeof(*cgd), gfp); if (!cgd) return NULL; return &cgd->cpd; |