From 30591021f78aad6cf250c6862d3dfbc847f7d812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Aug 2023 08:13:16 +0700
Subject: [PATCH] tp_smapi-dkms: for Linux 6.4

---
 srcpkgs/tp_smapi-dkms/patches/linux-6.4.patch | 45 +++++++++++++++++++
 srcpkgs/tp_smapi-dkms/template                |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tp_smapi-dkms/patches/linux-6.4.patch

diff --git a/srcpkgs/tp_smapi-dkms/patches/linux-6.4.patch b/srcpkgs/tp_smapi-dkms/patches/linux-6.4.patch
new file mode 100644
index 00000000000..4ff1facca07
--- /dev/null
+++ b/srcpkgs/tp_smapi-dkms/patches/linux-6.4.patch
@@ -0,0 +1,45 @@
+From 0c3398b1acf2a2cabd9cee91dc3fe3d35805fa8b Mon Sep 17 00:00:00 2001
+From: Evgeni Golov <evgeni@golov.de>
+Date: Fri, 16 Jun 2023 18:13:54 +0200
+Subject: [PATCH] update DEFINE_SEMAPHORE usage for linux 6.4+
+
+Linux changed the DEFINE_SEMAPHORE macro in
+48380368dec14859723b9e3fbd43e042638d9a76, making it take two parameters
+instead of one. Pass an explicit 1 as on 6.4+.
+---
+ thinkpad_ec.c | 4 +++-
+ tp_smapi.c    | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/thinkpad_ec.c b/thinkpad_ec.c
+index a8e812f..62ef5ca 100644
+--- a/thinkpad_ec.c
++++ b/thinkpad_ec.c
+@@ -90,8 +90,10 @@ static u64 prefetch_jiffies;                      /* time of prefetch, or: */
+ /* Locking: */
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(thinkpad_ec_mutex);
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(thinkpad_ec_mutex);
++#else
++static DEFINE_SEMAPHORE(thinkpad_ec_mutex, 1);
+ #endif
+ 
+ /* Kludge in case the ACPI DSDT reserves the ports we need. */
+diff --git a/tp_smapi.c b/tp_smapi.c
+index 6346287..9feebab 100644
+--- a/tp_smapi.c
++++ b/tp_smapi.c
+@@ -111,8 +111,10 @@ static unsigned short smapi_port;  /* APM control port, normally 0xB2 */
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(smapi_mutex);
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(smapi_mutex);
++#else
++static DEFINE_SEMAPHORE(smapi_mutex, 1);
+ #endif
+ 
+ /**
diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template
index 4ac8d085706..74aca4c0877 100644
--- a/srcpkgs/tp_smapi-dkms/template
+++ b/srcpkgs/tp_smapi-dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'tp_smapi-dkms'
 pkgname=tp_smapi-dkms
 version=0.43
-revision=2
+revision=3
 archs="i686* x86_64*"
 short_desc="IBM ThinkPad hardware functions driver"
 maintainer="Leah Neukirchen <leah@vuxu.org>"