Revert "ANDROID: block/cfq: Change the default values of group_idle and slice_idle to 0"
This reverts commit bdc2bc90ca2fc51a66059a7a8ae8df2796b2e749.
Reason for revert: this change is no longer needed since the blkio controller has been migrated back from the v2 to the v1 cgroup hierarchy.
Bug: 313578691
Change-Id: Ibcaff9973a46fd8bc4c917edbaa740f7f9766a9e
Signed-off-by: Bart Van Assche <bvanassche@google.com>
(cherry picked from commit 85a891d053dc2f500544c2ef4ad7cc03e660450d)
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 0e5f7cb..9ad5211 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -32,8 +32,8 @@
static const u64 cfq_slice_sync = NSEC_PER_SEC / 10;
static u64 cfq_slice_async = NSEC_PER_SEC / 25;
static const int cfq_slice_async_rq = 2;
-static u64 cfq_slice_idle;
-static u64 cfq_group_idle;
+static u64 cfq_slice_idle = NSEC_PER_SEC / 125;
+static u64 cfq_group_idle = NSEC_PER_SEC / 125;
static const u64 cfq_target_latency = (u64)NSEC_PER_SEC * 3/10; /* 300 ms */
static const int cfq_hist_divisor = 4;
