projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fbcon: Use fbcon_info_from_console() in fbcon_modechange_possible()
[linux-2.6-microblaze.git]
/
block
/
kyber-iosched.c
diff --git
a/block/kyber-iosched.c
b/block/kyber-iosched.c
index
fdd74a4
..
8f7c745
100644
(file)
--- a/
block/kyber-iosched.c
+++ b/
block/kyber-iosched.c
@@
-421,6
+421,8
@@
static int kyber_init_sched(struct request_queue *q, struct elevator_type *e)
blk_stat_enable_accounting(q);
blk_stat_enable_accounting(q);
+ blk_queue_flag_clear(QUEUE_FLAG_SQ_SCHED, q);
+
eq->elevator_data = kqd;
q->elevator = eq;
eq->elevator_data = kqd;
q->elevator = eq;
@@
-433,6
+435,7
@@
static void kyber_exit_sched(struct elevator_queue *e)
int i;
del_timer_sync(&kqd->timer);
int i;
del_timer_sync(&kqd->timer);
+ blk_stat_disable_accounting(kqd->q);
for (i = 0; i < KYBER_NUM_DOMAINS; i++)
sbitmap_queue_free(&kqd->domain_tokens[i]);
for (i = 0; i < KYBER_NUM_DOMAINS; i++)
sbitmap_queue_free(&kqd->domain_tokens[i]);
@@
-1032,7
+1035,6
@@
static struct elevator_type kyber_sched = {
#endif
.elevator_attrs = kyber_sched_attrs,
.elevator_name = "kyber",
#endif
.elevator_attrs = kyber_sched_attrs,
.elevator_name = "kyber",
- .elevator_features = ELEVATOR_F_MQ_AWARE,
.elevator_owner = THIS_MODULE,
};
.elevator_owner = THIS_MODULE,
};