pkgs/bfqsched: Update to version 4.4.0-v7r11

We can now drop the kernel 4.4 patch and use the upstream version,
because kernel 4.4 has been released since quite a while.

The names for the patches changed a bit on the BFQ scheduler page but
they represent the same commits nevertheless.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 10 insertions, 32 deletions

diff --git a/pkgs/kpatches/bfqsched/default.nix b/pkgs/kpatches/bfqsched/default.nix
index f71b7135..fd6c6f81 100644
--- a/pkgs/kpatches/bfqsched/default.nix
+++ b/pkgs/kpatches/bfqsched/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl }:
 
 let
-  bfqVersion = "v7r8";
-  kernelVersion = "4.3";
-  version = "${kernelVersion}.0-${bfqVersion}";
+  bfqVersion = "v7r11";
+  kernelVersion = "4.4";
+  fullKernelVersion = "${kernelVersion}.0";
+  version = "${fullKernelVersion}-${bfqVersion}";
 
   baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
 
@@ -15,20 +16,19 @@ let
   allPatches = [
     (fetchPatch {
       name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-"
-           + "${bfqVersion}-${kernelVersion}";
-      sha256 = "14549awmvsqwzb7912k83dmlznx5lak8gcivqjd79clrd4h65szb";
+           + "${bfqVersion}-${fullKernelVersion}";
+      sha256 = "1kmlfz63610zc4lxhanjsn4hhw43cdsbk3pyaij723vbd7619kyi";
     })
     (fetchPatch {
       name = "0002-block-introduce-the-BFQ-"
-           + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
-      sha256 = "1sw65hxjimg9w04f7ccrxhl1c8b1ddd21ni9af77cyrkp11cpdwi";
+           + "${bfqVersion}-I-O-sched-for-${fullKernelVersion}";
+      sha256 = "1i5jqkxglp3ah76i4vyi13pnmjkr6qlqy69qbaj2132vijqkyz5i";
     })
     (fetchPatch {
       name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
-           + "${bfqVersion}-for-${kernelVersion}.0";
-      sha256 = "178spkcwaz79rz8fb7h209grbgr2ca4lbgfmns4d43b7aiqhqhvp";
+           + "${bfqVersion}-for";
+      sha256 = "09bv31s8d2aphi3d9py4sz1gcvyb5645a8s7zj614a56hv11p8k9";
     })
-    ./kernel-4.4.patch
   ];
 
   patch = stdenv.mkDerivation {
diff --git a/pkgs/kpatches/bfqsched/kernel-4.4.patch b/pkgs/kpatches/bfqsched/kernel-4.4.patch
deleted file mode 100644
index 0001ec21..00000000
--- a/pkgs/kpatches/bfqsched/kernel-4.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index 71b51c1..1233eeb 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -3075,7 +3075,7 @@ retry:
- 		if (new_bfqq != NULL) {
- 			bfqq = new_bfqq;
- 			new_bfqq = NULL;
--		} else if (gfp_mask & __GFP_WAIT) {
-+		} else if (gfpflags_allow_blocking(gfp_mask)) {
- 			spin_unlock_irq(bfqd->queue->queue_lock);
- 			new_bfqq = kmem_cache_alloc_node(bfq_pool,
- 					gfp_mask | __GFP_ZERO,
-@@ -3574,7 +3574,7 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	unsigned long flags;
- 	bool split = false;
- 
--	might_sleep_if(gfp_mask & __GFP_WAIT);
-+	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
- 
- 	bfq_check_ioprio_change(bic);
-