Fix build on 6.1.1 kernel

Update .SRCINFO

4 files changed, 35 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d2422fc4e70..2d4eec5e32a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = binder_linux-dkms
 	pkgdesc = Android kernel driver fork by @choff in DKMS format, binder only.
-	pkgver = 6.0
-	pkgrel = 2
+	pkgver = 6.1
+	pkgrel = 1
 	url = https://github.com/choff/anbox-modules
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	depends = dkms
 	conflicts = anbox-modules-dkms
-	source = git+https://github.com/choff/anbox-modules.git#commit=2325d6fe45ef64fa94a8a05fcd75fc49e82e9dbb
-	source = 6.0-fix.diff
+	source = git+https://github.com/choff/anbox-modules.git#commit=cd66055f6d806d7f1534f38ff7142c75f6735e09
+	source = 6.1-fix.diff
 	sha256sums = SKIP
-	sha256sums = ab4cf84f5091cb4f0cd7521fbff78ec705556ff0a6b07d440b775a14705adec1
+	sha256sums = 9ffb0152256d20430aba08baf938f7523c399ae9714658f8d30a1001f26bda12
 
 pkgname = binder_linux-dkms
diff --git a/6.0-fix.diff b/6.0-fix.diff
deleted file mode 100644
index 499e7c47513d..000000000000
--- a/6.0-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/binder/binder_alloc.c b/binder/binder_alloc.c
-index 61dd545..7fe818d 100644
---- a/binder/binder_alloc.c
-+++ b/binder/binder_alloc.c
-@@ -23,6 +23,7 @@
- #include <linux/uaccess.h>
- #include <linux/highmem.h>
- #include <linux/sizes.h>
-+#include <linux/version.h>
- #include "binder_alloc.h"
- #include "binder_trace.h"
- 
-@@ -1079,7 +1080,11 @@ int binder_alloc_shrinker_init(void)
- 	int ret = list_lru_init(&binder_alloc_lru);
- 
- 	if (ret == 0) {
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,0,0))
-+		ret = register_shrinker(&binder_shrinker, "android-binder");
-+#else
- 		ret = register_shrinker(&binder_shrinker);
-+#endif
- 		if (ret)
- 			list_lru_destroy(&binder_alloc_lru);
- 	}
diff --git a/6.1-fix.diff b/6.1-fix.diff
new file mode 100644
index 000000000000..78f8a5755079
--- /dev/null
+++ b/6.1-fix.diff
@@ -0,0 +1,24 @@
+diff --git a/binder/binder.c b/binder/binder.c
+index a7e620b..8b9519a 100644
+--- a/binder/binder.c
++++ b/binder/binder.c
+@@ -4109,7 +4109,9 @@ static int binder_wait_for_work(struct binder_thread *thread,
+ 	struct binder_proc *proc = thread->proc;
+ 	int ret = 0;
+ 
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,1,0)
+ 	freezer_do_not_count();
++#endif
+ 	binder_inner_proc_lock(proc);
+ 	for (;;) {
+ 		prepare_to_wait(&thread->wait, &wait, TASK_INTERRUPTIBLE);
+@@ -4129,7 +4131,9 @@ static int binder_wait_for_work(struct binder_thread *thread,
+ 	}
+ 	finish_wait(&thread->wait, &wait);
+ 	binder_inner_proc_unlock(proc);
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,1,0)
+ 	freezer_count();
++#endif
+ 
+ 	return ret;
+ }
diff --git a/PKGBUILD b/PKGBUILD
index 6bfbcabd55bd..66b7287c4c79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Christian Hoff <https://github.com/choff>
 # Contributor: Tobias Martin <tm-x at gmx dot net>
 
-_commit=2325d6fe45ef64fa94a8a05fcd75fc49e82e9dbb
+_commit=cd66055f6d806d7f1534f38ff7142c75f6735e09
 
 pkgname=binder_linux-dkms
-pkgver=6.0
-pkgrel=2
+pkgver=6.1
+pkgrel=1
 arch=("x86_64")
 url='https://github.com/choff/anbox-modules'
 pkgdesc='Android kernel driver fork by @choff in DKMS format, binder only.'
@@ -16,12 +16,12 @@ depends=("dkms")
 makedepends=("git")
 source=(
     "git+${url}.git#commit=${_commit}"
-    "6.0-fix.diff")
+    "6.1-fix.diff")
 sha256sums=('SKIP'
-            'ab4cf84f5091cb4f0cd7521fbff78ec705556ff0a6b07d440b775a14705adec1')
+            '9ffb0152256d20430aba08baf938f7523c399ae9714658f8d30a1001f26bda12')
 prepare(){
     cd "${srcdir}/anbox-modules"
-    git apply "${srcdir}/6.0-fix.diff"
+    git apply "${srcdir}/6.1-fix.diff"
 }
 package(){
     install -dm755 "${pkgdir}/usr/src/binder-1"