diff --git a/[refs] b/[refs] index b009905ac2ab..1c919103640e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d870722965211de072bb36b446a4df99dae07e1 +refs/heads/master: 9481ffdc61738a91baf0f8b7fb20922768ae1b8e diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 579f31822469..090a4ee75b9d 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -936,7 +936,7 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd) sl = min(sl, msecs_to_jiffies(CFQ_MIN_TT)); mod_timer(&cfqd->idle_slice_timer, jiffies + sl); - cfq_log(cfqd, "arm_idle: %lu", sl); + cfq_log_cfqq(cfqd, cfqq, "arm_idle: %lu", sl); } /*