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 branches 'topic/vsp1' and 'topic/adv76xx' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
block
/
cfq-iosched.c
diff --git
a/block/cfq-iosched.c
b/block/cfq-iosched.c
index e0985f1955e7e0ea513ddf9cea104d571626a592..22dffebc7c73531ec235e27e188f66fa88b677d8 100644
(file)
--- a/
block/cfq-iosched.c
+++ b/
block/cfq-iosched.c
@@
-908,7
+908,7
@@
static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
{
if (cfqd->busy_queues) {
cfq_log(cfqd, "schedule dispatch");
{
if (cfqd->busy_queues) {
cfq_log(cfqd, "schedule dispatch");
- kblockd_schedule_work(
cfqd->queue,
&cfqd->unplug_work);
+ kblockd_schedule_work(&cfqd->unplug_work);
}
}
}
}
@@
-4460,7
+4460,7
@@
out_free:
static ssize_t
cfq_var_show(unsigned int var, char *page)
{
static ssize_t
cfq_var_show(unsigned int var, char *page)
{
- return sprintf(page, "%
d
\n", var);
+ return sprintf(page, "%
u
\n", var);
}
static ssize_t
}
static ssize_t