From 4ecfed8b359214f7f6ae90fbf7e46a5e4b53e927 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 11 Jan 2015 20:01:43 +0100
Subject: bfqsched: Update patch set to version 3.18-v7r7.

Changes for v7r7:

 * BUGFIX: Prevent the OOM queue from being involved in the queue
   cooperation mechanism. In fact, since the requests temporarily
   redirected to the OOM queue could be redirected again to dedicated
   queues at any time, the state needed to correctly handle merging with
   the OOM queue would be quite complex and expensive to maintain.
   Besides, in such a critical condition as an out of memory, the
   benefits of queue merging may be little relevant, or even negligible.
 * IMPROVEMENT: Let the OOM queue be initialized only once. Previously,
   the OOM queue was reinitialized, at each request enqueue, with the
   parameters related to the process that issued that request.
   Depending on the parameters of the processes doing I/O, this could
   easily cause the OOM queue to be moved continuously across service
   trees, or even across groups. It also caused the parameters of the
   OOM queue to be continuously reset in any case.
 * CODE IMPROVEMENT. Performed some minor code cleanups, and added some
   BUG_ON()s that, if the weight of an entity becomes inconsistent,
   should better help understand why.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/kpatches/bfqsched.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/kpatches/bfqsched.nix b/pkgs/kpatches/bfqsched.nix
index bb38f780..ff953a15 100644
--- a/pkgs/kpatches/bfqsched.nix
+++ b/pkgs/kpatches/bfqsched.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
 let
-  bfqVersion = "v7r6";
-  kernelVersion = "3.17";
+  bfqVersion = "v7r7";
+  kernelVersion = "3.18";
   version = "${kernelVersion}.0-${bfqVersion}";
 
   baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
@@ -16,17 +16,17 @@ let
     (fetchPatch {
       name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-"
            + "${bfqVersion}-${kernelVersion}";
-      sha256 = "1qx2i6ivnd8k6pgz39yx5dhrrmvl9ilnrbn9p72dkpa7dhw6yzqm";
+      sha256 = "0dfhz99xlhis06s28fihcvwvqnb4m0izyylscqar4a3gzdsk393m";
     })
     (fetchPatch {
       name = "0002-block-introduce-the-BFQ-"
            + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
-      sha256 = "0j0cjw0lrwyfib5mfrk1i8cdx1j62fjiy113x050zsmrrbq93rak";
+      sha256 = "0bc1mwqyvqmrv6rrsv3cak250d5im3h4dfhpkxg1gg3pyz7mn138";
     })
     (fetchPatch {
       name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
            + "${bfqVersion}-for-${kernelVersion}.0";
-      sha256 = "0i5fflxzaid7hp0zw0cq7i3q1ddgjrdivlm0kgfnh8a33h2vhw4y";
+      sha256 = "1nhrpgqyrnvzmyd19p6zz4yx1bipcsk4043idv1ghmdg27wrd8fd";
     })
   ];
 
-- 
cgit 1.4.1