From 172c95b25baadf7fd7e0969ef7be4ec80ff628d8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:16:17 +0000 Subject: [PATCH] Merge r7433 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7686 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 6eff883b0..dbd56358b 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -715,14 +715,14 @@ struct t10_pi_tuple { #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)->function = (void *)(_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); \ + (_timer)->function = (void *)(_fn);\ (_timer)->data = (unsigned long)(_timer); \ (_timer)->flags = (_flags); \ } while (0)