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 tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device...
[firefly-linux-kernel-4.4.55.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index afa3b037a17c3dfcfb466699544dbaf0fb05221e..59794d0d38e34604a24b6e7a63bf309570b2f8fb 100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-539,7
+539,7
@@
void elv_bio_merged(struct request_queue *q, struct request *rq,
e->type->ops.elevator_bio_merged_fn(q, rq, bio);
}
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static void blk_pm_requeue_request(struct request *rq)
{
if (rq->q->dev && !(rq->cmd_flags & REQ_PM))