Replace patch with upstream version

anduril · Jan 25, 2024 · db40afc · db40afc
1 parent fd40526
commit db40afc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 29 deletions.
diff --git a/kernel/0010-tegra-gpc-dma-mem-leak.patch b/kernel/0010-tegra-gpc-dma-mem-leak.patch
diff --git a/kernel/default.nix b/kernel/default.nix
@@ -1,6 +1,7 @@
 { pkgs
 , lib
 , fetchFromGitHub
+, fetchpatch
 , l4t-xusb-firmware
 , realtime ? false
 , kernelPatches ? [ ]
@@ -91,11 +92,16 @@ pkgsAarch64.buildLinux (args // {
 
     # Fix gcc13 compilation failure
     { patch = ./0009-bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch; }
-    
+
     # Fixes a memory leak by kernel tegra serial driver
     # This manifested via slab unreclaimable growing unbounded via repeated kmalloc-256 calls
-    # Patch is applied on tegra-gpc-dma.c
-    { patch = ./0010-tegra-gpc-dma-mem-leak.patch; }
+    # This patch is present in 35.4.1 and should be removed when we update
+    {
+      patch = fetchpatch {
+        url = "https://github.com/OE4T/linux-tegra-5.10/commit/d5b90d6b9365250adb73b2fe5b52a5228df3b1d9.patch";
+        sha256 = "sha256-a5LL4avaxQ3WYr9fRPMCfHrl4iAp1yhH95R+iI/PwYc=";
+      };
+    }
   ] ++ kernelPatches;
 
   structuredExtraConfig = with lib.kernel; {