From f118aba830e89374cef84b56c121e2b09ab35f5b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 03:15:02 +0000 Subject: [PATCH] Merge r7387 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7647 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 0576e0226..15b4bd634 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -708,9 +708,9 @@ struct t10_pi_tuple { #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) #undef DEFINE_TIMER #define DEFINE_TIMER(_name, _function) \ - struct timer_list _name = __TIMER_INITIALIZER( \ - (void (*)(unsigned long))(_function), \ - (unsigned long)&(_name), 0, 0) + struct timer_list _name = TIMER_INITIALIZER( \ + (void (*)(unsigned long))(_function), 0, \ + (unsigned long)&(_name)) #endif /* */