about summary refs log tree commit diff
path: root/overrides
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-07-01 16:03:31 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-07-01 16:03:31 +0200
commitb124643d26e17d4d96e7e2c30223d9920e74a3c0 (patch)
treedabf7723e1ff6273cb323cce02d3bb77a3c95f70 /overrides
parentf784af3eb66b8d7d9342134853ede2e7b8e60a98 (diff)
bfqsched: Fix patch agains kernel version 3.16.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'overrides')
-rw-r--r--overrides/kpatches/bfqsched.nix1
-rw-r--r--overrides/kpatches/bfqsched.patch13
2 files changed, 14 insertions, 0 deletions
diff --git a/overrides/kpatches/bfqsched.nix b/overrides/kpatches/bfqsched.nix
index cc2de2e9..3ba7310f 100644
--- a/overrides/kpatches/bfqsched.nix
+++ b/overrides/kpatches/bfqsched.nix
@@ -28,6 +28,7 @@ let
            + "${bfqVersion}-for-${kernelVersion}.0";
       sha256 = "1q3fn6gl3lhvbqfhaarpv399id9sa32zx6ygqx4x98zmixwrsn9z";
     })
+    ./bfqsched.patch
   ];
 
   patch = stdenv.mkDerivation {
diff --git a/overrides/kpatches/bfqsched.patch b/overrides/kpatches/bfqsched.patch
new file mode 100644
index 00000000..ae400155
--- /dev/null
+++ b/overrides/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);
+ 	}
+ }
+