laforge submitted this change.

View Change

kernel.h: Add wrappers for del_timer and del_timer_sync.

del_timer[_sync] was renamed to timer_delete[_sync] in kernel
commit bb663f0f3c396c6d05f6c5eeeea96ced20ff112e, and the
compatibility wrappers were removed completely in kernel commit
8fa7292fee5c5240402371ea89ab285ec856c916. Add the wrappers
back on newer kernels to allow compilation.

Resolves: #91
Change-Id: I71daee0fb678ed27c7764b7a6fe30c8bab762418
---
M include/dahdi/kernel.h
1 file changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index b707753..1756aaf 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -77,6 +77,11 @@
 #define PDE_DATA(i)	pde_data(i)
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0)
+#define del_timer timer_delete
+#define del_timer_sync timer_delete_sync
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 #include <linux/dma-mapping.h>
 static inline void *

To view, visit change 42005. To unsubscribe, or for help writing mail filters, visit settings.