Applied 0002-use-setup_timer-for-v4.15.patch from Beckhoff. stable-1.5
authorFlorian Pose
Tue, 30 Jan 2018 17:09:33 +0100
branchstable-1.5
changeset 2696 2b072c95b34c
parent 2695 ad58465e75ca
child 2697 4f5ae7e0fbaa
Applied 0002-use-setup_timer-for-v4.15.patch from Beckhoff.
examples/mini/mini.c
--- a/examples/mini/mini.c	Tue Jan 30 17:08:21 2018 +0100
+++ b/examples/mini/mini.c	Tue Jan 30 17:09:33 2018 +0100
@@ -307,7 +307,11 @@
 
 /*****************************************************************************/
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+void cyclic_task(struct timer_list *t)
+#else
 void cyclic_task(unsigned long data)
+#endif
 {
     // receive process data
     down(&master_sem);
@@ -492,8 +496,12 @@
 #endif
 
     printk(KERN_INFO PFX "Starting cyclic sample thread.\n");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+    timer_setup(&timer, cyclic_task, 0);
+#else
     init_timer(&timer);
     timer.function = cyclic_task;
+#endif
     timer.expires = jiffies + 10;
     add_timer(&timer);