Unverified Commit baf494e5 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #241639 from parthy/ax99100-linux-6-4 

linuxPackages.ax99100: Fix build with Linux 6.4
parents 30a8e2f4 79719555

pkgs/os-specific/linux/ax99100/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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" ];

pkgs/os-specific/linux/ax99100/kernel-6.4-fix-define-semaphore.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
--- 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 = {