diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-07-14 14:46:18 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-07-14 15:20:23 +0200 |
commit | d7b4a0e115bb46309706285e6005a64eae122568 (patch) | |
tree | 7d13afd3b0893ea12ccf3b47d43f07ec18d29ad3 /pkgs/kpatches | |
parent | 0aad7f1b85b854feea09308d32c046f68eb45e6b (diff) |
Move new packages from overrides/ into pkgs/.
Those packages aren't actually overrides and thus it doesn't make sense to categorize them into "overrides". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/kpatches')
-rw-r--r-- | pkgs/kpatches/bfqsched.nix | 46 | ||||
-rw-r--r-- | pkgs/kpatches/bfqsched.patch | 13 |
2 files changed, 59 insertions, 0 deletions
diff --git a/pkgs/kpatches/bfqsched.nix b/pkgs/kpatches/bfqsched.nix new file mode 100644 index 00000000..3ba7310f --- /dev/null +++ b/pkgs/kpatches/bfqsched.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl }: + +let + bfqVersion = "v7r5"; + kernelVersion = "3.15"; + version = "${kernelVersion}.0-${bfqVersion}"; + + baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches"; + + fetchPatch = { name, sha256 }: fetchurl { + url = "${baseURL}/${version}/${name}.patch"; + inherit sha256; + }; + + allPatches = [ + (fetchPatch { + name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-" + + "${bfqVersion}-${kernelVersion}"; + sha256 = "16vrdg9ky7q89sb7gp8as7qslqg1zy1n28cnyshm91qnf49wfh7g"; + }) + (fetchPatch { + name = "0002-block-introduce-the-BFQ-" + + "${bfqVersion}-I-O-sched-for-${kernelVersion}"; + sha256 = "1gf4y5i9prhg9ls2g8apaiygm538khhpp35dahgv59hr3sfwsghs"; + }) + (fetchPatch { + name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-" + + "${bfqVersion}-for-${kernelVersion}.0"; + sha256 = "1q3fn6gl3lhvbqfhaarpv399id9sa32zx6ygqx4x98zmixwrsn9z"; + }) + ./bfqsched.patch + ]; + + patch = stdenv.mkDerivation { + name = "bfqsched-${version}.patch"; + inherit allPatches; + buildCommand = '' + sed -e 's/IS_SUBSYS_ENABLED/IS_ENABLED/' \ + -e '/SUBSYS/s/perf/&_event/' $allPatches > "$out" + ''; + }; + +in { + name = "bfqsched-${version}"; + inherit version patch; +} diff --git a/pkgs/kpatches/bfqsched.patch b/pkgs/kpatches/bfqsched.patch new file mode 100644 index 00000000..ae400155 --- /dev/null +++ b/pkgs/kpatches/bfqsched.patch @@ -0,0 +1,13 @@ +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +index 4579c6dd..d1d8e67 100644 +--- a/block/bfq-iosched.c ++++ b/block/bfq-iosched.c +@@ -199,7 +199,7 @@ static inline void bfq_schedule_dispatch(struct bfq_data *bfqd) + { + if (bfqd->queued != 0) { + bfq_log(bfqd, "schedule dispatch"); +- kblockd_schedule_work(bfqd->queue, &bfqd->unplug_work); ++ kblockd_schedule_work(&bfqd->unplug_work); + } + } + |