sync

2026-05-08 01:04:52 -04:00
1 parent 41dcdc4c65
commit 177eb62caf
@@ -1,3 +1,4 @@
 {
-  "source": "aur"
+  "source": "aur",
+  "upstream_commit": "2b9d53e5c81a0293100ca5e9c0187c6c52d77e66"
 }
@@ -1,28 +0,0 @@
-From 82f3c2441c636c59550201b9f2ee3c4cbecbb886 Mon Sep 17 00:00:00 2001
-From: Peter Jung <admin@ptr1337.dev>
-Date: Mon, 9 Feb 2026 17:10:25 +0100
-Subject: [PATCH] nvidia-uvm: Add fix for 6.19 Kernel
-
-Signed-off-by: Peter Jung <admin@ptr1337.dev>
---
- kernel-open/nvidia-uvm/uvm_hmm.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kernel-open/nvidia-uvm/uvm_hmm.c b/kernel-open/nvidia-uvm/uvm_hmm.c
-index 2ddf64b7..9f045ccf 100644
--- a/kernel-open/nvidia-uvm/uvm_hmm.c
-+++ b/kernel-open/nvidia-uvm/uvm_hmm.c
-@@ -78,7 +78,9 @@ module_param(uvm_disable_hmm, bool, 0444);
- // Pass 0 as the order, when actual large order support is added this
- // function will need to be revisited
- //
-#if defined(NV_ZONE_DEVICE_PAGE_INIT_HAS_ORDER_ARG)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
-+#define ZONE_DEVICE_PAGE_INIT(page)   zone_device_page_init(page, page_pgmap(page), 0)
-+#elif defined(NV_ZONE_DEVICE_PAGE_INIT_HAS_ORDER_ARG)
- #define ZONE_DEVICE_PAGE_INIT(page)   zone_device_page_init(page, 0)
- #else
- #define ZONE_DEVICE_PAGE_INIT(page)   zone_device_page_init(page)
-- 
-2.53.0
-
@@ -1,35 +0,0 @@
-From 1ab454e3114dbe6bc61e35be9b6cbcbfe119bfaf Mon Sep 17 00:00:00 2001
-From: Peter Jung <admin@ptr1337.dev>
-Date: Thu, 26 Feb 2026 16:53:26 +0100
-Subject: [PATCH] kernel-open/Makefile: Fix PAHOLE_VARIABLES for kernels using
- gen-btf.sh, fix for 7.0rc1
-
-Signed-off-by: Peter Jung <admin@ptr1337.dev>
---
- kernel-open/Makefile | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a//Makefile b/Makefile
-index f7a8db69f..9a3fc281e 100644
--- a/Makefile
-+++ b/Makefile
-@@ -92,10 +92,15 @@ else
-   #     system(pahole_cmd)
-   # }
-   PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
-  # If scripts/pahole-flags.sh is not present in the kernel tree, add PAHOLE and
-  # PAHOLE_AWK_PROGRAM assignments to PAHOLE_VARIABLES; otherwise assign the
-  # empty string to PAHOLE_VARIABLES.
-  PAHOLE_VARIABLES=$(if $(wildcard $(KERNEL_SOURCES)/scripts/pahole-flags.sh),,"PAHOLE=$(AWK) '$(PAHOLE_AWK_PROGRAM)'")
-+  # If scripts/pahole-flags.sh is not present AND scripts/gen-btf.sh is not
-+  # present in the kernel tree, add PAHOLE and PAHOLE_AWK_PROGRAM assignments
-+  # to PAHOLE_VARIABLES; otherwise assign the empty string to PAHOLE_VARIABLES.
-+  #
-+  # scripts/gen-btf.sh was introduced in kernel 7.0 (formerly 6.17) when
-+  # scripts/pahole-flags.sh was removed.  The gen-btf.sh-based BTF generation
-+  # calls ${PAHOLE} inside a shell script, so the awk wrapper used here is
-+  # incompatible (shell word-splitting breaks the single-quoted awk program).
-+  PAHOLE_VARIABLES=$(if $(or $(wildcard $(KERNEL_SOURCES)/scripts/pahole-flags.sh),$(wildcard $(KERNEL_SOURCES)/scripts/gen-btf.sh)),,"PAHOLE=$(AWK) '$(PAHOLE_AWK_PROGRAM)'")
- 
-   ifndef ARCH
-     ARCH := $(shell uname -m | sed -e 's/i.86/i386/' \