mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 13:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r7385 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7645 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 03:14:27 +00:00
parent 45bc780e5b
commit 1a8bb00f10
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scst/include/backport.h
View File

@@ -708,7 +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(_function, 0, 0, 0)
struct timer_list _name = __TIMER_INITIALIZER( \
(void (*)(unsigned long))(_function), \
(unsigned long)&(_name), 0, 0)
#endif
/* <linux/types.h> */

4
scst/src/scst_lib.c
View File

@@ -15368,7 +15368,7 @@ EXPORT_SYMBOL_GPL(scst_random);
#define INIT_TM_DBG_STATE TM_DBG_STATE_ABORT
static void tm_dbg_timer_fn(unsigned long arg);
static void tm_dbg_timer_fn(struct timer_list *timer);
static DEFINE_SPINLOCK(scst_tm_dbg_lock);
/* All serialized by scst_tm_dbg_lock */
@@ -15422,7 +15422,7 @@ static void tm_dbg_deinit_tgt_dev(struct scst_tgt_dev *tgt_dev)
return;
}
static void tm_dbg_timer_fn(unsigned long arg)
static void tm_dbg_timer_fn(struct timer_list *timer)
{
TRACE_MGMT_DBG("%s", "delayed cmd timer expired");
tm_dbg_flags.tm_dbg_release = 1;