Patch for Linux 6.3

3 files changed, 31 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d28984d074fe..ecd358eeeda2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amduprof
 	pkgdesc = AMD uProf performance analysis tool.
 	pkgver = 4.0.341
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.amd.com/amd-uprof/
 	install = amduprof.install
 	arch = x86_64
@@ -12,8 +12,10 @@ pkgbase = amduprof
 	options = !strip
 	options = libtool
 	source = local://AMDuProf_Linux_x64_4.0.341.tar.bz2
-	source = local://modulefile
+	source = modulefile
+	source = PwrProfSharedMemOps_linux_6.3.patch
 	md5sums = 4cd023e8631a9f72edbb3109e0ce11ec
 	md5sums = SKIP
+	md5sums = 527a005cefeeab1aeeafb6ab9ac6c380
 
 pkgname = amduprof
diff --git a/PKGBUILD b/PKGBUILD
index 8e36127b5da2..e8af1a368649 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,25 @@
 _pkgname=AMDuProf_Linux_x64
 pkgname=amduprof
 pkgver=4.0.341
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD uProf performance analysis tool."
 arch=('x86_64')
 license=('custom')
 url="https://developer.amd.com/amd-uprof/"
-source=("local://AMDuProf_Linux_x64_${pkgver}.tar.bz2"
-		"local://modulefile")
+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" "SKIP")
+md5sums=(
+	"4cd023e8631a9f72edbb3109e0ce11ec"
+	"SKIP"
+	"527a005cefeeab1aeeafb6ab9ac6c380"
+)
 
 amduprof_prefix=/opt/${pkgname}
 
@@ -35,7 +42,9 @@ package() {
 	local _modname=AMDPowerProfiler
 	local _modver=$(cat bin/AMDPowerProfilerVersion)
 	tar zxf bin/AMDPowerProfilerDriverSource.tar.gz -C "${srcdir}"
+	# Fix issue for kernel 6.3
 	cd "${srcdir}"/${_modname}-${_modver}
+	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
new file mode 100644
index 000000000000..9305c712d103
--- /dev/null
+++ b/PwrProfSharedMemOps_linux_6.3.patch
@@ -0,0 +1,14 @@
+--- 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);