diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-05-26 13:43:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-05-26 17:42:42 +0000 |
| commit | a3d0197ac9683e59307471d40766b3d1dc330125 (patch) | |
| tree | 509721d1124ef524e5cc26c464dac850589fb3ca | |
| parent | Merge pull request #234197 from NixOS/backport-233668-to-release-23.05 (diff) | |
| download | nixpkgs-a3d0197ac9683e59307471d40766b3d1dc330125.tar.gz | |
kernelPatches.make-maple-state-reusable-after-mas_empty_area: drop
No longer used.
(cherry picked from commit 1e73fcbebfa5d791bf7782a5bf00a28f565b4d75)
| -rw-r--r-- | pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch | 21 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
2 files changed, 0 insertions, 27 deletions
diff --git a/pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch b/pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch deleted file mode 100644 index 47e1bbbd5a68..000000000000 --- a/pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/maple_tree.c -+++ b/lib/maple_tree.c -@@ -5317,15 +5317,9 @@ - - mt = mte_node_type(mas->node); - pivots = ma_pivots(mas_mn(mas), mt); -- if (offset) -- mas->min = pivots[offset - 1] + 1; -- -- if (offset < mt_pivots[mt]) -- mas->max = pivots[offset]; -- -- if (mas->index < mas->min) -- mas->index = mas->min; -- -+ min = mas_safe_min(mas, pivots, offset); -+ if (mas->index < min) -+ mas->index = min; - mas->last = mas->index + size - 1; - return 0; - } diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2330db4e68c3..f2225096dd5c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,12 +58,6 @@ patch = ./export-rt-sched-migrate.patch; }; - # https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/patch/?id=39bf07d812b888b23983a9443ad967ca9b61551d - make-maple-state-reusable-after-mas_empty_area = { - name = "make-maple-state-reusable-after-mas_empty_area"; - patch = ./make-maple-state-reusable-after-mas_empty_area.patch; - }; - fix-em-ice-bonding = { name = "fix-em-ice-bonding"; patch = ./fix-em-ice-bonding.patch; |