git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #106534 from orivej/zfs-rt
commitd25e1ac42605ad063b895d3c8cead3b5a5ae428e authorJörg Thalheim <Mic92@users.noreply.github.com> dateThu 10 Dec 2020, 15:10 (6 years ago) parent0f41c844376b91
4 files changed+26
compare with master
unifiedsplit
pkgs/os-specific/linux/kernel/export-rt-sched-migrate.patch+11 pkgs/os-specific/linux/kernel/patches.nix+5 pkgs/os-specific/linux/zfs/default.nix+9 pkgs/top-level/all-packages.nix+1
pkgs/os-specific/linux/kernel/export-rt-sched-migrate.patchnew file+11
@@ -0,0 +1,11 @@
1+Export linux-rt (PREEMPT_RT) specific symbols needed by ZFS.
2+(Regular kernel provides them static inline in linux/preempt.h.)
3+
4+--- a/kernel/sched/core.c
5++++ b/kernel/sched/core.c
6+@@ -1812 +1812 @@ void migrate_disable(void)
7+-EXPORT_SYMBOL_GPL(migrate_disable);
8++EXPORT_SYMBOL(migrate_disable);
9+@@ -1843 +1843 @@ void migrate_enable(void)
10+-EXPORT_SYMBOL_GPL(migrate_enable);
11++EXPORT_SYMBOL(migrate_enable);
pkgs/os-specific/linux/kernel/patches.nix+5
@@ -87,6 +87,11 @@
8787 };
8888 };
8989
90+ export-rt-sched-migrate = {
91+ name = "export-rt-sched-migrate";
92+ patch = ./export-rt-sched-migrate.patch;
93+ };
94+
9095 # patches from https://lkml.org/lkml/2019/7/15/1748
9196 mac_nvme_t2 = rec {
9297 name = "mac_nvme_t2";
pkgs/os-specific/linux/zfs/default.nix+9
@@ -176,6 +176,11 @@ let
176176 maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
177177 };
178178 };
179+
180+ linux-rt-patch = fetchpatch {
181+ url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch";
182+ sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36";
183+ };
179184in {
180185 # also check if kernel version constraints in
181186 # ./nixos/modules/tasks/filesystems/zfs.nix needs
@@ -188,6 +193,8 @@ in {
188193 version = "2.0.0";
189194
190195 sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
196+
197+ extraPatches = [ linux-rt-patch ];
191198 };
192199
193200 zfsUnstable = common {
@@ -198,5 +205,7 @@ in {
198205 version = "2.0.0";
199206
200207 sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
208+
209+ extraPatches = [ linux-rt-patch ];
201210 };
202211}
pkgs/top-level/all-packages.nix+1
@@ -18363,6 +18363,7 @@ in
1836318363 kernelPatches.bridge_stp_helper
1836418364 kernelPatches.request_key_helper
1836518365 kernelPatches.export_kernel_fpu_functions."5.3"
18366+ kernelPatches.export-rt-sched-migrate
1836618367 ];
1836718368 };
1836818369