cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
linuxPackages.ax99100: Fix build with Linux 6.4
This commit is contained in:
Sandro 2023-07-06 00:44:01 +02:00 committed by GitHub
commit baf494e5d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/os-specific/linux/ax99100/default.nix
View file

@ -28,6 +28,7 @@ stdenv.mkDerivation {
./kernel-6.1-set_termios-const-ktermios.patch ./kernel-6.1-set_termios-const-ktermios.patch
] ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [ ] ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [
./kernel-6.2-fix-pointer-type.patch ./kernel-6.2-fix-pointer-type.patch
./kernel-6.4-fix-define-semaphore.patch
]; ];
patchFlags = [ "-p0" ]; patchFlags = [ "-p0" ];

14
pkgs/os-specific/linux/ax99100/kernel-6.4-fix-define-semaphore.patch Normal file
View file

@ -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 = {