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 'sysfs' into release
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-settings.c
diff --git
a/block/blk-settings.c
b/block/blk-settings.c
index b21dcdb64151abd31a5cc66ff11db955b0e90a80..41392fbe19ff9615253278fdf48e63369ad7e856 100644
(file)
--- a/
block/blk-settings.c
+++ b/
block/blk-settings.c
@@
-141,8
+141,6
@@
void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)
if (q->unplug_delay == 0)
q->unplug_delay = 1;
- INIT_WORK(&q->unplug_work, blk_unplug_work);
-
q->unplug_timer.function = blk_unplug_timeout;
q->unplug_timer.data = (unsigned long)q;