summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorcamb2023-06-06 14:07:48 +0100
committercamb2023-06-06 14:14:47 +0100
commite898d9ba5200dfa9503e8d8e708350b39a65da48 (patch)
tree15ff051664f21ccb336c851d1109c85e663b57ab
parent04fa06c325ae450bd389ad9c079579ae1f2da19e (diff)
downloadaur-e898d9ba5200dfa9503e8d8e708350b39a65da48.tar.gz
Update for Linux 6.3 build breakages
It appears that we can no longer simply modify vm_flags in a struct vm_area_struct. There are handy accessors now. Added a patch to use them.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--linux-6.3+-vm_flags_set.patch11
3 files changed, 19 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 72d11820ac70..154ae215bb15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dektec-dkms
pkgdesc = DekTec DKMS
pkgver = 2022.12.2
- pkgrel = 1
+ pkgrel = 2
url = https://www.dektec.com/
arch = i686
arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = dektec-dkms
source = linux-3.18-netif-changes.patch
source = linux-6.2+-prefix-symbols.patch
source = linux-6.2+-prefix-symbols.2022.06.0.patch
+ source = linux-6.3+-vm_flags_set.patch
source = dkms.conf
source = Makefile
md5sums = 72685face3bcf3b5c0aadf569ba8cca5
@@ -19,6 +20,7 @@ pkgbase = dektec-dkms
md5sums = 7bcb9def37608558fbdef4053af96792
md5sums = 8c4c8d92a5840ad03c5f6e0bcd27500b
md5sums = 5817a31229c1f12ea0b3c6fc3fea05fa
+ md5sums = facbf2c909bded3ca94c93360f02a7e2
md5sums = 539fb620aadf7fcab3f29156b6e8bdc4
md5sums = e0a9e12767006053c4e71ecd49dd2769
diff --git a/PKGBUILD b/PKGBUILD
index 36395ce7c46d..bf2fd8637004 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=dektec-dkms
pkgver=2022.12.2
-pkgrel=1
+pkgrel=2
pkgdesc="DekTec DKMS"
arch=('i686' 'x86_64')
url="https://www.dektec.com/"
@@ -14,6 +14,7 @@ source=("${url}/products/SDK/DTAPI/Downloads/LinuxSDK_v${pkgver}.tar.gz"
'linux-3.18-netif-changes.patch'
'linux-6.2+-prefix-symbols.patch'
'linux-6.2+-prefix-symbols.2022.06.0.patch'
+ 'linux-6.3+-vm_flags_set.patch'
'dkms.conf'
'Makefile')
md5sums=('72685face3bcf3b5c0aadf569ba8cca5'
@@ -21,6 +22,7 @@ md5sums=('72685face3bcf3b5c0aadf569ba8cca5'
'7bcb9def37608558fbdef4053af96792'
'8c4c8d92a5840ad03c5f6e0bcd27500b'
'5817a31229c1f12ea0b3c6fc3fea05fa'
+ 'facbf2c909bded3ca94c93360f02a7e2'
'539fb620aadf7fcab3f29156b6e8bdc4'
'e0a9e12767006053c4e71ecd49dd2769')
@@ -35,6 +37,8 @@ prepare() {
# patch. It is also still in the repo and checksumed so you're fine to use.
patch -d LinuxSDK -p0 -i "${srcdir}"/linux-6.2+-prefix-symbols.patch
+ patch -d LinuxSDK -p0 -i "${srcdir}"/linux-6.3+-vm_flags_set.patch
+
sed -e"s/@PKGVER@/${pkgver}/" -i "${srcdir}"/dkms.conf
}
diff --git a/linux-6.3+-vm_flags_set.patch b/linux-6.3+-vm_flags_set.patch
new file mode 100644
index 000000000000..289db448115c
--- /dev/null
+++ b/linux-6.3+-vm_flags_set.patch
@@ -0,0 +1,11 @@
+--- Drivers/Dta/Source/Linux/DtaIal.c 2023-06-06 13:44:08.233215971 +0100
++++ Drivers/Dta/Source/Linux/DtaIal.c 2023-06-06 13:47:26.153399824 +0100
+@@ -786,7 +786,7 @@
+ pDvcData->m_pUserMapping = pUserMapping;
+
+ // Be sure the memory is mapped non-cacheable
+- pVma->vm_flags |= VM_IO;
++ vm_flags_set(pVma, VM_IO);
+ pVma->vm_page_prot = pgprot_noncached(pVma->vm_page_prot);
+
+ RegionStart = pDvcData->m_DtaRegs.m_PciAddr.QuadPart;