linuxPackages.ax99100: Fix build with Linux 6.4

2023-07-05 10:58:25 +02:00 · 2023-07-05 10:58:25 +02:00 · 79719555e2
parent 9336e11d5e
commit 79719555e2
2 changed files with 15 additions and 0 deletions
--- a/pkgs/os-specific/linux/ax99100/default.nix
+++ b/pkgs/os-specific/linux/ax99100/default.nix
@ -28,6 +28,7 @@ stdenv.mkDerivation {
    ./kernel-6.1-set_termios-const-ktermios.patch
  ] ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [
    ./kernel-6.2-fix-pointer-type.patch
+    ./kernel-6.4-fix-define-semaphore.patch
  ];

  patchFlags = [ "-p0" ];
--- a/pkgs/os-specific/linux/ax99100/kernel-6.4-fix-define-semaphore.patch
+++ b/pkgs/os-specific/linux/ax99100/kernel-6.4-fix-define-semaphore.patch
@ -0,0 +1,14 @@
+--- ax99100_sp.c
+++ ax99100_sp.c
+@@ -2670,8 +2670,10 @@ static void serial99100_dma_tx_tasklet (unsigned long param)
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(serial99100_sem);
+-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(serial99100_sem);
+#else
+static DEFINE_SEMAPHORE(serial99100_sem, 1);
+ #endif
+ 
+ static struct uart_driver starex_serial_driver = {