amduprof 4.1.424

4 files changed, 8 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecd358eeeda2..eca4a75f25e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amduprof
 	pkgdesc = AMD uProf performance analysis tool.
-	pkgver = 4.0.341
-	pkgrel = 2
+	pkgver = 4.1.424
+	pkgrel = 1
 	url = https://developer.amd.com/amd-uprof/
 	install = amduprof.install
 	arch = x86_64
@@ -11,11 +11,9 @@ pkgbase = amduprof
 	options = staticlibs
 	options = !strip
 	options = libtool
-	source = local://AMDuProf_Linux_x64_4.0.341.tar.bz2
+	source = local://AMDuProf_Linux_x64_4.1.424.tar.bz2
 	source = modulefile
-	source = PwrProfSharedMemOps_linux_6.3.patch
-	md5sums = 4cd023e8631a9f72edbb3109e0ce11ec
+	md5sums = 1ec35feb80b7141e0e06eba847ed71f8
 	md5sums = SKIP
-	md5sums = 527a005cefeeab1aeeafb6ab9ac6c380
 
 pkgname = amduprof
diff --git a/PKGBUILD b/PKGBUILD
index ad61feb2c2d2..c3b220dc7fb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=AMDuProf_Linux_x64
 pkgname=amduprof
-pkgver=4.0.341
-pkgrel=2
+pkgver=4.1.424
+pkgrel=1
 pkgdesc="AMD uProf performance analysis tool."
 arch=('x86_64')
 license=('custom')
@@ -12,16 +12,14 @@ url="https://developer.amd.com/amd-uprof/"
 source=(
 	"local://AMDuProf_Linux_x64_${pkgver}.tar.bz2"
 	"modulefile"
-	"PwrProfSharedMemOps_linux_6.3.patch"
 )
 options=('staticlibs' '!strip' 'libtool')
 optdepends=('env-modules')
 depends=(dkms)
 install=amduprof.install
 md5sums=(
-	"4cd023e8631a9f72edbb3109e0ce11ec"
+	"1ec35feb80b7141e0e06eba847ed71f8"
 	"SKIP"
-	"527a005cefeeab1aeeafb6ab9ac6c380"
 )
 
 amduprof_prefix=/opt/${pkgname}
@@ -43,8 +41,6 @@ package() {
 	local _modver=$(cat bin/AMDPowerProfilerVersion)
 	tar zxf bin/AMDPowerProfilerDriverSource.tar.gz -C "${srcdir}"
 	cd "${srcdir}"/${_modname}-${_modver}
-	# Fix issue for kernel 6.3
-	patch -Np1 < "${srcdir}/PwrProfSharedMemOps_linux_6.3.patch"
 	mkdir -p "${pkgdir}"/usr/src/${_modname}-${_modver}
 	cp -dr --no-preserve=ownership {inc/,src/,AMDPowerProfilerVersion,dkms.conf,Makefile} \
 		"${pkgdir}"/usr/src/${_modname}-${_modver}
diff --git a/PwrProfSharedMemOps_linux_6.3.patch b/PwrProfSharedMemOps_linux_6.3.patch
deleted file mode 100644
index 9305c712d103..000000000000
--- a/PwrProfSharedMemOps_linux_6.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/PwrProfSharedMemOps.c	2023-05-22 09:25:25.497609732 +0200
-+++ b/src/PwrProfSharedMemOps.c	2023-05-22 09:27:59.994309381 +0200
-@@ -219,7 +219,11 @@
-     if (NULL != file && NULL != vma)
-     {
-         vma->vm_ops          = &sharedBuffer_mmap_vm_ops1;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
-+        vm_flags_set(vma, VM_RESERVED);
-+#else
-         vma->vm_flags       |= VM_RESERVED;
-+#endif
-         vma->vm_private_data = file->private_data;
-
-         pp_anon_inode_mmap_open(vma);
diff --git a/modulefile b/modulefile
index 42edec0859cc..19492fc402de 100644
--- a/modulefile
+++ b/modulefile
@@ -5,7 +5,7 @@
 
 set MODULE      "amduprof"
 set BASE_DIR    "/opt"
-set VERSION     "4.0.341"
+set VERSION     "4.1.424"
 set MODULE_ROOT "${BASE_DIR}/${MODULE}"
 set MODULE_TEXT "AMD uProf performance analysis tool"