Skip to content

Commit 520cf14

Browse files
committed
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
1 parent 648016d commit 520cf14

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

include/dahdi/kernel.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
#endif /* RHEL_RELEASE_CODE */
6767
#endif
6868

69+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0)
70+
#define del_timer timer_delete
71+
#define del_timer_sync timer_delete_sync
72+
#endif
73+
6974
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
7075
#include <linux/pci.h>
7176
#include <linux/dma-mapping.h>

0 commit comments

Comments
 (0)