diff -Nru tp-smapi-0.43/debian/changelog tp-smapi-0.43/debian/changelog
--- tp-smapi-0.43/debian/changelog	2021-10-01 20:47:02.000000000 +0800
+++ tp-smapi-0.43/debian/changelog	2023-11-23 18:00:23.000000000 +0800
@@ -1,3 +1,11 @@
+tp-smapi (0.43-1ubuntu2) jammy; urgency=medium
+
+  * d/p/0001-update-DEFINE_SEMAPHORE-usage-for-linux-6.4.patch:
+    cherry-pick from upstream 0c3398b1 to fix build errors
+    on 6.4 kernel or later one. (LP: #2035561)
+
+ -- Bin Li <bin.li@canonical.com>  Thu, 23 Nov 2023 18:00:23 +0800
+
 tp-smapi (0.43-1ubuntu1) impish; urgency=medium
 
   * Restrict this module to amd64 (LP: #1945784)
diff -Nru tp-smapi-0.43/debian/patches/0001-update-DEFINE_SEMAPHORE-usage-for-linux-6.4.patch tp-smapi-0.43/debian/patches/0001-update-DEFINE_SEMAPHORE-usage-for-linux-6.4.patch
--- tp-smapi-0.43/debian/patches/0001-update-DEFINE_SEMAPHORE-usage-for-linux-6.4.patch	1970-01-01 08:00:00.000000000 +0800
+++ tp-smapi-0.43/debian/patches/0001-update-DEFINE_SEMAPHORE-usage-for-linux-6.4.patch	2023-11-23 18:00:23.000000000 +0800
@@ -0,0 +1,48 @@
+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
+ 
+ /**
+-- 
+2.40.1
+
diff -Nru tp-smapi-0.43/debian/patches/series tp-smapi-0.43/debian/patches/series
--- tp-smapi-0.43/debian/patches/series	1970-01-01 08:00:00.000000000 +0800
+++ tp-smapi-0.43/debian/patches/series	2023-11-23 18:00:23.000000000 +0800
@@ -0,0 +1 @@
+0001-update-DEFINE_SEMAPHORE-usage-for-linux-6.4.patch