From a1118b406a59cfc9392f4e44a66a0b93d03864ae Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 4 Nov 2014 03:25:07 +0100
Subject: bfqsched: Update patches to 3.17.0-v7r6.

Although we're building for 3.18, the patch should still apply.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/kpatches/bfqsched-3.17.patch | 38 --------------------------------------
 pkgs/kpatches/bfqsched.nix        | 11 +++++------
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/kpatches/bfqsched-3.17.patch

(limited to 'pkgs')

diff --git a/pkgs/kpatches/bfqsched-3.17.patch b/pkgs/kpatches/bfqsched-3.17.patch
deleted file mode 100644
index 5b9effa5..00000000
--- a/pkgs/kpatches/bfqsched-3.17.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0daf37ef3f4ad76f3e56f888b48111c1b6c9119d Mon Sep 17 00:00:00 2001
-From: Arianna Avanzini <avanzini.arianna@gmail.com>
-Date: Sun, 17 Aug 2014 07:07:24 -0500
-Subject: [PATCH] block: Switch from BFQ-v7r6 for 3.16.0 to BFQ-v7r6 for
- 3.17.0-rc1
-
----
- block/bfq-cgroup.c | 2 +-
- block/bfq.h        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-index f742806..eb140eb 100644
---- a/block/bfq-cgroup.c
-+++ b/block/bfq-cgroup.c
-@@ -871,7 +871,7 @@ struct cgroup_subsys bfqio_cgrp_subsys = {
- 	.can_attach = bfqio_can_attach,
- 	.attach = bfqio_attach,
- 	.css_free = bfqio_destroy,
--	.base_cftypes = bfqio_files,
-+	.legacy_cftypes = bfqio_files,
- };
- #else
- static inline void bfq_init_entity(struct bfq_entity *entity,
-diff --git a/block/bfq.h b/block/bfq.h
-index ebbd040..34b37bf 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -1,5 +1,5 @@
- /*
-- * BFQ-v7r5 for 3.16.0: data structures and common functions prototypes.
-+ * BFQ-v7r5 for 3.17.0-rc1: data structures and common functions prototypes.
-  *
-  * Based on ideas and code from CFQ:
-  * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
--- 
-2.0.4
-
diff --git a/pkgs/kpatches/bfqsched.nix b/pkgs/kpatches/bfqsched.nix
index 61dbcab8..bb38f780 100644
--- a/pkgs/kpatches/bfqsched.nix
+++ b/pkgs/kpatches/bfqsched.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
 let
-  bfqVersion = "v7r5";
-  kernelVersion = "3.16";
+  bfqVersion = "v7r6";
+  kernelVersion = "3.17";
   version = "${kernelVersion}.0-${bfqVersion}";
 
   baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
@@ -16,19 +16,18 @@ let
     (fetchPatch {
       name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-"
            + "${bfqVersion}-${kernelVersion}";
-      sha256 = "1f93n0hy9vmxpfmkdkss4b711mxly23r1z6n832prq3qph9xzkwm";
+      sha256 = "1qx2i6ivnd8k6pgz39yx5dhrrmvl9ilnrbn9p72dkpa7dhw6yzqm";
     })
     (fetchPatch {
       name = "0002-block-introduce-the-BFQ-"
            + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
-      sha256 = "1b5dwivas7j56v47pq2wyy4dlvmk4f9y051ja9lila6rqfd4wns4";
+      sha256 = "0j0cjw0lrwyfib5mfrk1i8cdx1j62fjiy113x050zsmrrbq93rak";
     })
     (fetchPatch {
       name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
            + "${bfqVersion}-for-${kernelVersion}.0";
-      sha256 = "0rjcmjigqkfplnsh0mdrjf6w9ng02yjwyql6k5kk39wf1q6vf7ch";
+      sha256 = "0i5fflxzaid7hp0zw0cq7i3q1ddgjrdivlm0kgfnh8a33h2vhw4y";
     })
-    ./bfqsched-3.17.patch
   ];
 
   patch = stdenv.mkDerivation {
-- 
cgit 1.4.1