diff --git a/scst/include/backport.h b/scst/include/backport.h
index d06230ee4..ef697ee1a 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -682,11 +682,19 @@ struct t10_pi_tuple {
 
 /* <linux/timer.h> */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
 /*
  * See also commit 686fef928bba ("timer: Prepare to change timer callback
- * argument type").
+ * argument type"). See also commit 0eeda71bc30d ("timer: Replace timer base
+ * by a cpu index").
  */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+#define timer_setup(_timer, _fn, _flags) do {			\
+	init_timer(_timer);					\
+	(_timer)->function = (void (*)(unsigned long))(_fn);	\
+	(_timer)->data = (unsigned long)(_timer);		\
+	WARN_ON_ONCE((_flags) != 0);				\
+} while (0)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
 #define timer_setup(_timer, _fn, _flags) do {			\
 	init_timer(_timer);					\
 	(_timer)->function = (void (*)(unsigned long))(_fn);	\