From dc0166b60f3510c3fe28d77c291fcece9de0e6f2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Oct 2016 03:12:36 +0200 Subject: tishtushi: Update BFQ scheduler patch for v4.9-rc2 The rebased patch has been announced upstream at: https://groups.google.com/forum/#!topic/bfq-iosched/Et-axgapbrs Unfortunately the GitHub branch isn't linked there, but it can be found here: https://github.com/linusw/linux-bfq/tree/add-bfq-logical This time the patch adds the BFQ scheduler as an extra scheduler instead of modifying CFQ, so we need to add extra kernel options again. Signed-off-by: aszlig --- machines/aszlig/tishtushi.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'machines') diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix index a4408487..b7cf74c6 100644 --- a/machines/aszlig/tishtushi.nix +++ b/machines/aszlig/tishtushi.nix @@ -15,12 +15,18 @@ in { kernelPatches = singleton { name = "bfqsched"; patch = pkgs.fetchpatch { - name = "cfq-replacement.patch"; + name = "bfqsched.patch"; url = "https://github.com/linusw/linux-bfq/compare/" - + "29b4817d4018df78086157ea3a55c1d9424a7cfc" - + "...cfq_replacement-logical.patch"; - sha256 = "1b3n287r31g0sn85f88dmd00wlsccnm90mr5sr8lj4g1fvnfswqv"; + + "07d9a380680d1c0eb51ef87ff2eab5c994949e69" + + "...add-bfq-logical.patch"; + sha256 = "078k0fm7d4ahfrz6g9xgzsv3iqbcc2haj803jrn2c1rpghcpm9g8"; }; + extraConfig = '' + IOSCHED_BFQ y + DEFAULT_BFQ y + DEFAULT_CFQ n + DEFAULT_IOSCHED "bfq" + ''; }; kernelPackages = with pkgs; let -- cgit 1.4.1