laforge submitted this change.

View Change

dahdi_dummy: Use hrtimer_setup on kernels >= 6.15.0.

Kernel commit 908a1d775422ba2e27a5e33d0c130b522419e121 introduced
hrtimer_setup to eventually replace hrtimer_init, which was done
in kernel commit 9779489a31d77a7b9cb6f20d2d2caced4e29dbe6.
Accordingly, we now use the new setup process on newer kernels.

Resolves: #93
Change-Id: Ied0bdb1e32c30cff9208fd181efe7f494e230964
---
M drivers/dahdi/dahdi_dummy.c
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c
index b1004d9..44cd3ba 100644
--- a/drivers/dahdi/dahdi_dummy.c
+++ b/drivers/dahdi/dahdi_dummy.c
@@ -229,12 +229,14 @@
 
 #if defined(USE_HIGHRESTIMER)
 	printk(KERN_DEBUG "dahdi_dummy: Trying to load High Resolution Timer\n");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+	hrtimer_setup(&zaptimer, dahdi_dummy_hr_int, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+#else
 	hrtimer_init(&zaptimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-	printk(KERN_DEBUG "dahdi_dummy: Initialized High Resolution Timer\n");
-
 	/* Set timer callback function */
 	zaptimer.function = dahdi_dummy_hr_int;
-
+#endif /* LINUX_VERSION_CODE */
+	printk(KERN_DEBUG "dahdi_dummy: Initialized High Resolution Timer\n");
 	printk(KERN_DEBUG "dahdi_dummy: Starting High Resolution Timer\n");
 	hrtimer_start(&zaptimer, ktime_set(0, DAHDI_TIME_NS), HRTIMER_MODE_REL);
 	printk(KERN_INFO "dahdi_dummy: High Resolution Timer started, good to go\n");

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