- fix building modules for kernel 5.9

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 44286b27007806f485fb03a242ad03445eeef9e7..ede2bd3a8ed1b762814dcb9df108ea1140658dae 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -61,6 +61,7 @@ Patch0:               kernel-4.14.patch
 Patch1:                kernel-5.4.patch
 Patch2:                math64.patch
 Patch3:                kernel-5.6.patch
+Patch4:                kernel-5.9.patch
 URL:           http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires: perl-base
@@ -164,6 +165,7 @@ cd ../..\
 %patch2 -p1
 %endif
 %patch3 -p1
+%patch4 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware

diff --git a/kernel-5.9.patch b/kernel-5.9.patch
new file mode 100644 (file)
index 0000000..e8ac52b
--- /dev/null
+++ b/kernel-5.9.patch
@@ -0,0 +1,16 @@
+--- dahdi-linux-3.1.0/include/dahdi/kernel.h~  2020-10-21 07:44:12.000000000 +0200
++++ dahdi-linux-3.1.0/include/dahdi/kernel.h   2020-10-21 08:05:07.153002470 +0200
+@@ -58,6 +58,13 @@
+ 
+ #include <linux/poll.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++#define HAVE_UNLOCKED_IOCTL 1
++#ifdef CONFIG_COMPAT
++#define HAVE_COMPAT_IOCTL 1
++#endif
++#endif
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+ #ifdef CONFIG_PCI
+ #include <linux/pci-aspm.h>