Unverified Commit 90094f50 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

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

pkgs/linux: Vendor maple tree patch
parents 25f227fc 81bc5f3d

pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
--- 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;

 }

pkgs/os-specific/linux/kernel/patches.nix

+3 −6
Original line number Diff line number Diff line
@@ -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 = {