colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #232072 from hercules-ci/linux-vendor-maple-tree-patch

Browse Source 
pkgs/linux: Vendor maple tree patch
This commit is contained in:
Robert Hensing 2023-05-15 23:17:25 +02:00 committed by GitHub
commit 90094f5098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch Normal file
View File

@ -0,0 +1,21 @@
--- 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;
}

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -58,13 +58,10 @@
patch = ./export-rt-sched-migrate.patch;
};
make-maple-state-reusable-after-mas_empty_area = rec {
# 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 = fetchpatch {
name = name + ".patch";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/patch/?id=39bf07d812b888b23983a9443ad967ca9b61551d";
hash = "sha256-JHEFq+Gw8Dtl0M8pXcKXpwkaHhbbl5NwTSzvV5qP4hk=";
};
patch = ./make-maple-state-reusable-after-mas_empty_area.patch;
};
fix-em-ice-bonding = {